commit db621ac2301c5516a208208e3909bb016be91a3e
author Andrew Walbran <qwandor@google.com> Tue Nov 14 14:38:10 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 14 14:38:10 2023 +0000
tree 96ebc3c961da38666bc6dce75be10e853bed03cf
parent d10defd5d79ca093cf909162749962da795638a2
parent af0a48a7cc62c1bc82f5e62bd0cbfe32e24d0356

Migrate to cargo_embargo. am: 59d61a5fc0 am: 905bc77000 am: af0a48a7cc

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/unicode-normalization/+/2828013

Change-Id: If4841f4417b97db2cfe385bf0424cf1a0174efdc
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 1aa08ab..39be20a 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 {
@@ -52,9 +52,7 @@
         "default",
         "std",
     ],
-    rustlibs: [
-        "libtinyvec",
-    ],
+    rustlibs: ["libtinyvec"],
     apex_available: [
         "//apex_available:platform",
         "com.android.resolv",
@@ -81,7 +79,5 @@
         "default",
         "std",
     ],
-    rustlibs: [
-        "libtinyvec",
-    ],
+    rustlibs: ["libtinyvec"],
 }

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 911c36f..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.resolv"
-  ],
-  "dependencies": true,
-  "device": true,
-  "min-sdk-version": "29",
-  "run": true,
-  "tests": true
-}
\ No newline at end of file

cargo_embargo.json

diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..b8ed541
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,9 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.resolv"
+  ],
+  "min_sdk_version": "29",
+  "run_cargo": false,
+  "tests": true
+}