commit 792228312a07ee5fb59c2d09f669b33d3712f5ee
author Andrew Walbran <qwandor@google.com> Thu Nov 09 02:01:20 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 09 02:01:20 2023 +0000
tree 48ee41b78c1e72eb9663462575ceb0b18d076614
parent 33edfbf585c05528faf8c2db5dc336f847d5c7e1
parent cce81842fab2447282aa1cb7f62501c4a0c6e873

Migrate to cargo_embargo. am: efa01a6dd4 am: 8ccf5079cf am: cce81842fa

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cfg-if/+/2822540

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

Android.bp

diff --git a/Android.bp b/Android.bp
index 8711098..07a3150 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 {
@@ -65,9 +65,7 @@
         unit_test: true,
     },
     edition: "2018",
-    rustlibs: [
-        "libcfg_if",
-    ],
+    rustlibs: ["libcfg_if"],
 }
 
 rust_library {

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index c789f3b..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "//apex_available:anyapex"
-  ],
-  "dependencies": true,
-  "device": true,
-  "min-sdk-version": "29",
-  "run": true,
-  "tests": true,
-  "vendor-available": true
-}

cargo_embargo.json

diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..16616e0
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,5 @@
+{
+  "min_sdk_version": "29",
+  "run_cargo": false,
+  "tests": true
+}