commit 4fe939ff4defc057b09dccc45075c84ac36e614b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Nov 22 21:42:09 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Nov 22 21:42:09 2023 +0000
tree d2618b8cf461a238b69a2ff07ff803222c8fae74
parent 98baf8376e9b39ee3cde59f1b15d86c0e763a8f6
parent dbb20153d3868b780d86cd892f5482b2fb6fb100

Snap for 11135399 from dbb20153d3868b780d86cd892f5482b2fb6fb100 to simpleperf-release

Change-Id: I26f3d59898ce35a824d910ebf4f81cb4d0a02432

Android.bp

diff --git a/Android.bp b/Android.bp
index 4b50bf1..3755207 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo_embargo.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -47,9 +47,7 @@
     cargo_pkg_version: "4.1.0",
     srcs: ["src/lib.rs"],
     edition: "2018",
-    rustlibs: [
-        "libnom",
-    ],
+    rustlibs: ["libnom"],
     apex_available: [
         "//apex_available:platform",
         "com.android.virt",
@@ -71,7 +69,5 @@
         unit_test: true,
     },
     edition: "2018",
-    rustlibs: [
-        "libnom",
-    ],
+    rustlibs: ["libnom"],
 }

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 8e490de..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "device": true,
-  "run": true,
-  "tests": true
-}

cargo_embargo.json

diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..fcc96ec
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,8 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "run_cargo": false,
+  "tests": true
+}