Snap for 11111096 from 37bf0d14d7f825f4bb05f708726fc3e4fcff99af 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: I159a0183e5cb60e5daaef5f1cb4c500b8a8a58f3

3 files changed, 16 insertions, 19 deletions

diff --git a/Android.bp b/Android.bp
index d7efeea..af83e04 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 a13f256..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.runtime",
-    "com.android.art.debug",
-    "com.android.art"
-  ],
-  "device": true,
-  "min-sdk-version": "S",
-  "native-bridge-supported": true,
-  "product-available": true,
-  "ramdisk-available": true,
-  "recovery-available": true,
-  "run": true,
-  "tests": true,
-  "vendor-available": true,
-  "vendor-ramdisk-available": true
-}
\ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..f40467e
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,15 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.runtime",
+    "com.android.art.debug",
+    "com.android.art"
+  ],
+  "min_sdk_version": "S",
+  "native_bridge_supported": true,
+  "ramdisk_available": true,
+  "recovery_available": true,
+  "run_cargo": false,
+  "tests": true,
+  "vendor_ramdisk_available": true
+}