Snap for 11130662 from f13a18b8e756ca94ffe8887d4358b34a7c9e4ff4 to sdk-release

Change-Id: If8e410846ee11e910ab8db2fb4fb802dbf921e3b

3 files changed, 9 insertions, 14 deletions

diff --git a/Android.bp b/Android.bp
index 4c7c2ac..f847d8a 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 {
@@ -26,9 +26,7 @@ rust_library {
     cargo_pkg_version: "0.7.4",
     srcs: ["src/lib.rs"],
     edition: "2015",
-    rustlibs: [
-        "libcfg_if",
-    ],
+    rustlibs: ["libcfg_if"],
     apex_available: [
         "//apex_available:platform",
         "com.android.virt",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 9569807..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "dependencies": true,
-  "device": true,
-  "run": true,
-  "vendor_available": true
-}
\ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..fbb9fcd
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,7 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "run_cargo": false
+}