aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-14 14:04:59 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-14 14:04:59 +0000
commitaf0a48a7cc62c1bc82f5e62bd0cbfe32e24d0356 (patch)
tree96ebc3c961da38666bc6dce75be10e853bed03cf
parentcd05ca5e052e16782351414873af1a9a132695d3 (diff)
parent905bc7700021f254833fa7a7f8e1044f147e4818 (diff)
downloadunicode-normalization-af0a48a7cc62c1bc82f5e62bd0cbfe32e24d0356.tar.gz
Migrate to cargo_embargo. am: 59d61a5fc0 am: 905bc77000
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/unicode-normalization/+/2828013 Change-Id: I87ad74d52da3ee8a7a9884e97d749374fcf5f7fc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp10
-rw-r--r--cargo2android.json11
-rw-r--r--cargo_embargo.json9
3 files changed, 12 insertions, 18 deletions
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 @@ rust_library {
"default",
"std",
],
- rustlibs: [
- "libtinyvec",
- ],
+ rustlibs: ["libtinyvec"],
apex_available: [
"//apex_available:platform",
"com.android.resolv",
@@ -81,7 +79,5 @@ rust_test {
"default",
"std",
],
- rustlibs: [
- "libtinyvec",
- ],
+ rustlibs: ["libtinyvec"],
}
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
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
+}