Snap for 11107449 from f73ae172d996ed148ec8fbed5eb88d7e40ed8f04 to emu-34-release

Change-Id: Iaf9b01aa1cae9e9b5e74e08086a961c31342451e

3 files changed, 10 insertions, 15 deletions

diff --git a/Android.bp b/Android.bp
index 16390d5a..049a22dd 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 {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 7572bb6b..00000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "//apex_available:anyapex"
-  ],
-  "dependencies": true,
-  "device": true,
-  "features": "default,extra_traits,std",
-  "min-sdk-version": "29",
-  "product-available": true,
-  "run": true,
-  "tests": true,
-  "vendor-available": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 00000000..fde4fff2
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,9 @@
+{
+  "features": [
+    "default",
+    "extra_traits",
+    "std"
+  ],
+  "min_sdk_version": "29",
+  "tests": true
+}