Snap for 11124398 from 545a4722101e1fe324ba9a566bec70575ebe4047 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: Ia96a27b022d9a85cf190aa78466c62ca5c7996ad

3 files changed, 16 insertions, 12 deletions

diff --git a/Android.bp b/Android.bp
index 5049fb7..335a89e 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 01e723e..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "dependencies": true,
-  "device": true,
-  "features": "arbitrary-derive",
-  "force-rlib": true,
-  "lib-blocklist": [
-    "fuzzer",
-    "stdc++"
-  ],
-  "run": true
-}
\ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..1369b28
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,15 @@
+{
+  "features": [
+    "arbitrary-derive"
+  ],
+  "package": {
+    "libfuzzer-sys": {
+      "dep_blocklist": [
+        "libfuzzer",
+        "libstdc++"
+      ],
+      "force_rlib": true
+    }
+  },
+  "run_cargo": false
+}