Snap for 11097608 from 55f3a57650097afabc2a074003fa1db26b5124ad 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: I3622ce45978349b11bdd9a138e75a45a6f3d02fc

3 files changed, 12 insertions, 18 deletions

diff --git a/Android.bp b/Android.bp
index 1aa08ab..39be20a 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 {
@@ -52,9 +52,7 @@ rust_library {
         "default",
         "std",
     ],
-    rustlibs: [
-        "libtinyvec",
-    ],
+    rustlibs: ["libtinyvec"],
     apex_available: [
         "//apex_available:platform",
         "com.android.resolv",
@@ -81,7 +79,5 @@ rust_test {
         "default",
         "std",
     ],
-    rustlibs: [
-        "libtinyvec",
-    ],
+    rustlibs: ["libtinyvec"],
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 911c36f..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.resolv"
-  ],
-  "dependencies": true,
-  "device": true,
-  "min-sdk-version": "29",
-  "run": true,
-  "tests": true
-}
\ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..b8ed541
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,9 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.resolv"
+  ],
+  "min_sdk_version": "29",
+  "run_cargo": false,
+  "tests": true
+}