Snap for 11084970 from 33d2678f1cb1a56c1831348db38bd20f16a16a5e 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: I3ed776547b3c1614076419d50fc882a86993cf0d

3 files changed, 7 insertions, 12 deletions

diff --git a/Android.bp b/Android.bp
index 6dbf830..7937a8e 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 {
@@ -45,9 +45,7 @@ rust_library {
     cargo_pkg_version: "0.1.2",
     srcs: ["src/lib.rs"],
     edition: "2015",
-    rustlibs: [
-        "liblinked_hash_map",
-    ],
+    rustlibs: ["liblinked_hash_map"],
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
@@ -69,7 +67,5 @@ rust_test {
         unit_test: true,
     },
     edition: "2015",
-    rustlibs: [
-        "liblinked_hash_map",
-    ],
+    rustlibs: ["liblinked_hash_map"],
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index d36fb44..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "device": true,
-  "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..c8842d1
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,4 @@
+{
+  "run_cargo": false,
+  "tests": true
+}