diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:10:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:10:41 +0000 |
| commit | 736f43b9e5b8601a1607bf51ad8fac57e799e755 (patch) | |
| tree | 1c1e122603b15be120f3543d316e8ef57b8b4420 | |
| parent | b20b8c94c8918ef692a62e20a99061063fcf9aaa (diff) | |
| parent | e2b95ed46927b33a2aa71b7c6ac2b126b7a4387d (diff) | |
| download | clap-android12-qpr1-d-s2-release.tar.gz | |
Generate apex_available from c2a instead of a patch am: 45bd22d6ac am: 659e5981d3 am: e2b95ed469android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/clap/+/1688623
Change-Id: I8d18f1e07c64e8b51b38a076de3c0b8b3c135dd9
| -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"] |