Migrate to cargo_embargo. am: 4e010678ac am: 783eb19e49 am: d82a6447ae

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/num_cpus/+/2838081

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

3 files changed, 22 insertions, 25 deletions

diff --git a/Android.bp b/Android.bp
index 422335c..381c686 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 {
@@ -45,9 +45,7 @@ rust_library {
     cargo_pkg_version: "1.15.0",
     srcs: ["src/lib.rs"],
     edition: "2015",
-    rustlibs: [
-        "liblibc",
-    ],
+    rustlibs: ["liblibc"],
     apex_available: [
         "//apex_available:platform",
         "com.android.btservices",
@@ -73,7 +71,5 @@ rust_test {
         unit_test: false,
     },
     edition: "2015",
-    rustlibs: [
-        "liblibc",
-    ],
+    rustlibs: ["liblibc"],
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index d95e478..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.btservices",
-    "com.android.compos",
-    "com.android.resolv",
-    "com.android.uwb",
-    "com.android.virt"
-  ],
-  "dependencies": true,
-  "device": true,
-  "min-sdk-version": "29",
-  "no-presubmit": true,
-  "patch": "patches/Android.bp.patch",
-  "run": true,
-  "tests": true,
-  "vendor-available": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..ca7d422
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,19 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.btservices",
+    "com.android.compos",
+    "com.android.resolv",
+    "com.android.uwb",
+    "com.android.virt"
+  ],
+  "min_sdk_version": "29",
+  "package": {
+    "num_cpus": {
+      "no_presubmit": true,
+      "patch": "patches/Android.bp.patch"
+    }
+  },
+  "run_cargo": false,
+  "tests": true
+}