Snap for 11024862 from 35acf1dc8fe3a562ec062f521507b63498fa83f7 to simpleperf-release

Change-Id: I91351b2b13cdc5fb9d0df28b346f06404267810e

3 files changed, 12 insertions, 15 deletions

diff --git a/Android.bp b/Android.bp
index 36ba6ab..387051e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
-// 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 {
     default_applicable_licenses: ["external_rust_crates_anes_license"],
 }
@@ -100,9 +98,7 @@ rust_library {
         "bitflags",
         "parser",
     ],
-    rustlibs: [
-        "libbitflags-1.3.2",
-    ],
+    rustlibs: ["libbitflags-1.3.2"],
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index eac39f0..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "device": true,
-  "run": true,
-  "features": "parser",
-  "tests": true,
-  "dep-suffixes": {
-    "bitflags": "-1.3.2"
-  }
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..71c6d2d
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,10 @@
+{
+  "tests": true,
+  "features": [
+    "parser"
+  ],
+  "module_name_overrides": {
+    "libbitflags": "libbitflags-1.3.2"
+  },
+  "run_cargo": false
+}