diff options
author | Andrew Walbran <qwandor@google.com> | 2023-11-14 13:34:09 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-14 13:34:09 +0000 |
commit | ec6ca2494a229c430cbafaf71c433953d7135b3c (patch) | |
tree | 96ebc3c961da38666bc6dce75be10e853bed03cf | |
parent | 5ec3d860448add78b61be8759959cb035c70edf8 (diff) | |
parent | 59d61a5fc01fb0b5c66dfcd51ce0d57265f38e30 (diff) | |
download | unicode-normalization-ec6ca2494a229c430cbafaf71c433953d7135b3c.tar.gz |
Migrate to cargo_embargo. am: 59d61a5fc0
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/unicode-normalization/+/2828013
Change-Id: Iea8a4a312abdeb002238937cfa429930ef0acc2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 10 | ||||
-rw-r--r-- | cargo2android.json | 11 | ||||
-rw-r--r-- | cargo_embargo.json | 9 |
3 files changed, 12 insertions, 18 deletions
@@ -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 +} |