diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:34:18 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:34:18 +0000 |
commit | 8a809276a3df93bbc3b727129bc612dbb7f29e21 (patch) | |
tree | 3bd9375068a14132a49e5f30afab363dd976f9d9 | |
parent | 39187a39bfe11c4d2e96727c25f4432f4af984ee (diff) | |
parent | b4d4d09d0da1e1d6f55aac65a242d7e3aa5f482e (diff) | |
download | textwrap-android12L-d2-s2-release.tar.gz |
Generate apex_available from c2a instead of a patch am: daceeab774 am: b4ad798bd2 am: d3dec24328 am: b4d4d09d0dandroid-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/textwrap/+/1689920
Change-Id: Ia953c2f4d571e2c879f2043ae814ad5706abb84f
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | cargo2android.json | 10 | ||||
-rw-r--r-- | patches/Android.bp.patch | 13 |
3 files changed, 11 insertions, 14 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --dependencies --device --features= --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 356e1c2..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index f879002..893238d 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -7,4 +7,8 @@ rust_library { - crate_name: "textwrap", - srcs: ["src/lib.rs"], - edition: "2018", -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } |