diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:32:13 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:32:13 +0000 |
commit | 7ae1389ca7a804c23acc04fe78533bffbcc7addf (patch) | |
tree | a37d77a527c577f11a2c00f84694c9fd47b5617b | |
parent | ecdc3edb0a452d81390b8c96dfcbe0bd370f3201 (diff) | |
parent | dcd7fa19f594224dda8ec327473448164332b258 (diff) | |
download | itoa-7ae1389ca7a804c23acc04fe78533bffbcc7addf.tar.gz |
Generate apex_available from c2a instead of a patch am: 4f4e7e28e7 am: 2b7f7e3719 am: 67a59fb873 am: dcd7fa19f5
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/itoa/+/1689105
Change-Id: I16ec329cf8dd620b334251e2c6176a3a2903d7e3
-rw-r--r-- | Android.bp | 3 | ||||
-rw-r--r-- | cargo2android.json | 9 | ||||
-rw-r--r-- | patches/Android.bp.patch | 13 |
3 files changed, 11 insertions, 14 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --run --device --dependencies. +// This file is generated by cargo2android.py --config cargo2android.json. +// Do not modify this file as changes will be overridden on upgrade. package { default_applicable_licenses: ["external_rust_crates_itoa_license"], diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..42b7833 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,9 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], + "dependencies": true, + "device": true, + "run": true +}
\ No newline at end of file diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch deleted file mode 100644 index 1394742..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index cf4bc93..1e6793a 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -10,4 +10,8 @@ rust_library { - "default", - "std", - ], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } |