Snap for 11135399 from b44adca430cca6a3a63f76c81fee2208f1ecb9e5 to simpleperf-release

Change-Id: I2bc078b04a962666c59b26d2ac931a1496564172

3 files changed, 14 insertions, 10 deletions

diff --git a/Android.bp b/Android.bp
index 1595d5e..d969720 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 {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 150a550..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "dependencies": true,
-  "device": true,
-  "features": "derive,error-context,help,std,usage",
-  "run": true,
-  "dep-suffixes": {
-    "bitflags": "-1.3.2"
-  }
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..235341a
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,13 @@
+{
+  "features": [
+    "derive",
+    "error-context",
+    "help",
+    "std",
+    "usage"
+  ],
+  "module_name_overrides": {
+    "libbitflags": "libbitflags-1.3.2"
+  },
+  "run_cargo": false
+}