commit c71bbc2b525e75328d6534d70b191119c42a090b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Nov 22 21:42:00 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Nov 22 21:42:00 2023 +0000
tree 39639f80a777a5c403086198b1a0fe2904c979b6
parent ea34da85e4067f62cc3ce8ac13f5d22c5721f5e1
parent d939d4fef19440a6a8b18eb174668ff25dd67218

Snap for 11135399 from d939d4fef19440a6a8b18eb174668ff25dd67218 to simpleperf-release

Change-Id: I1b6aa018819a5499c9a1e7ef8bccd6788ddc1570

Android.bp

diff --git a/Android.bp b/Android.bp
index 841b4e1..12d95c4 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 {
@@ -51,9 +51,7 @@
         "getrandom",
         "std",
     ],
-    rustlibs: [
-        "libgetrandom",
-    ],
+    rustlibs: ["libgetrandom"],
     apex_available: [
         "//apex_available:platform",
         "com.android.virt",
@@ -80,7 +78,5 @@
         "getrandom",
         "std",
     ],
-    rustlibs: [
-        "libgetrandom",
-    ],
+    rustlibs: ["libgetrandom"],
 }

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 8945bb0..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "dependencies": true,
-  "device": true,
-  "features": "std",
-  "run": true,
-  "tests": true,
-  "vendor-available": true
-}

cargo_embargo.json

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