Migrate to cargo_embargo. am: fdbe7c8a60 am: f98a04f1cb am: aaf7267d90

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/aarch64-paging/+/2796177

Change-Id: Icdef0245b263dd30155b4810c6b58219d20b5934
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3 files changed, 16 insertions, 18 deletions

diff --git a/Android.bp b/Android.bp
index cf6d40e..59675b5 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 {
@@ -57,9 +57,7 @@ rust_test {
         "alloc",
         "default",
     ],
-    rustlibs: [
-        "libbitflags",
-    ],
+    rustlibs: ["libbitflags"],
     enabled: false,
     arch: {
         arm64: {
@@ -80,9 +78,7 @@ rust_library {
         "alloc",
         "default",
     ],
-    rustlibs: [
-        "libbitflags",
-    ],
+    rustlibs: ["libbitflags"],
     apex_available: [
         "//apex_available:platform",
         "com.android.virt",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 7cf9e83..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "add-module-block": "cargo2android_module.bp",
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "dependencies": true,
-  "device": true,
-  "run": true,
-  "tests": true
-}
\ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..e9f4935
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,13 @@
+{
+  "tests": true,
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "package": {
+    "aarch64-paging": {
+      "add_module_block": "cargo2android_module.bp"
+    }
+  },
+  "run_cargo": false
+}