diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:34:19 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:34:19 +0000 |
commit | 527bdf4c032d15c017256e29f80e8e87302a0bdc (patch) | |
tree | 1c1e122603b15be120f3543d316e8ef57b8b4420 | |
parent | b20b8c94c8918ef692a62e20a99061063fcf9aaa (diff) | |
parent | 736f43b9e5b8601a1607bf51ad8fac57e799e755 (diff) | |
download | clap-android12L-d2-s5-release.tar.gz |
Generate apex_available from c2a instead of a patch am: 45bd22d6ac am: 659e5981d3 am: e2b95ed469 am: 736f43b9e5android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-release
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/clap/+/1688623
Change-Id: Ice0e4469aa45567d212cf5d712c7879af1ba872d
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | cargo2android.json | 10 | ||||
-rw-r--r-- | patches/Android.bp.patch | 15 |
3 files changed, 11 insertions, 16 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --dependencies --features= --device --patch=patches/Android.bp.patch. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..b933b33 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,10 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], + "dependencies": true, + "device": true, + "features": "", + "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 5a0245a..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 91fb287..583186b 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -12,6 +12,10 @@ rust_library { - "libbitflags", - "libtextwrap", - ], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } - - // dependent_library ["feature_list"] |