Snap for 11006111 from 5be076e383187a0f85e3e6230d978aadf1df191e to emu-34-release

Change-Id: Ib7d400877f5cc44606cffd638b7ec94cc50fece7

3 files changed, 10 insertions, 13 deletions

diff --git a/Android.bp b/Android.bp
index b3de44e..aff3f3f 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 {
@@ -54,9 +54,7 @@ rust_test {
         "unicode",
         "unicode-segmentation",
     ],
-    rustlibs: [
-        "libunicode_segmentation",
-    ],
+    rustlibs: ["libunicode_segmentation"],
 }
 
 rust_library {
@@ -71,9 +69,7 @@ rust_library {
         "unicode",
         "unicode-segmentation",
     ],
-    rustlibs: [
-        "libunicode_segmentation",
-    ],
+    rustlibs: ["libunicode_segmentation"],
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 5f2af9d..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "device": true,
-  "run": true,
-  "tests": true,
-  "features": "unicode"
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..5fe28da
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,7 @@
+{
+  "tests": true,
+  "features": [
+    "unicode"
+  ],
+  "run_cargo": false
+}