Snap for 11084970 from ad7bbb2ad8a959be3ac288c1d8b35931d0826647 to 24Q1-release

Change-Id: I0d833d488cb9fad73218ec865da2f3f32439e528

Android.bp

diff --git a/Android.bp b/Android.bp
index 480a3bc..b0585b0 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: "libgoogletest_macro",
     crate_name: "googletest_macro",

cargo2android.json

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

cargo_embargo.json

diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..9a0a579
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,3 @@
+{
+  "tests": true
+}