commit 4e380232ff2b9f1f407eb56ae9f78ada6fdf65fa
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Nov 11 22:10:33 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Nov 11 22:10:33 2023 +0000
tree 6eb9f131ed1891891cd5e1c073a461a7dadde927
parent 458249dd759bc1beaffa18a5d228a6144b7f7734
parent 03ad3e1ab16043f860fb82e14ed007e79ba77987

Snap for 11086585 from 03ad3e1ab16043f860fb82e14ed007e79ba77987 to 24Q1-release

Change-Id: I05a22bf6b67de046ba9ad5274cc09232082471cf

Android.bp

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 {

cargo2android.json

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"
-  }
-}

cargo_embargo.json

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
+}