Snap for 11085410 from 9a628ff99a2c897918d7b7c23629d27348b5a33e to 24D1-release

Change-Id: I3b41b34e86379ccad08e67bfbeb021682b8aba37

Android.bp

diff --git a/Android.bp b/Android.bp
index a09cf8b..934e857 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
-// 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.
 
-
-
 rust_proc_macro {
     name: "liblinkme_impl",
     crate_name: "linkme_impl",

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 1b6cca2..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "dependencies": true,
-  "device": true,
-  "run": true
-}
\ No newline at end of file

cargo_embargo.json

diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..cb908d7
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,3 @@
+{
+  "run_cargo": false
+}