Snap for 11124398 from de04c5f41c2db68aeb00a2db87f55a98685d98c4 to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: Id0768d3b1edd1802d0db6f219f3a543e390003be

3 files changed, 10 insertions, 15 deletions

diff --git a/Android.bp b/Android.bp
index dddc7ae..81ae991 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 {
@@ -26,9 +26,7 @@ rust_library {
     cargo_pkg_version: "1.0.0",
     srcs: ["src/lib.rs"],
     edition: "2018",
-    rustlibs: [
-        "liblibc",
-    ],
+    rustlibs: ["liblibc"],
     apex_available: [
         "//apex_available:platform",
         "com.android.compos",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 4f8003c..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.compos",
-    "com.android.virt"
-  ],
-  "dependencies": true,
-  "device": true,
-  "run": true,
-  "tests": false
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..dd2bfad
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,8 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.compos",
+    "com.android.virt"
+  ],
+  "run_cargo": false
+}