diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:34:26 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:34:26 +0000 |
commit | e79bffb98abf7420befc87b5d9786c67149234b4 (patch) | |
tree | 81666efe5312581e144a03f9be6dc2f9d65ff7bb | |
parent | f5b2794d044e73b2b1af5b49f1d24e4079790bce (diff) | |
parent | e8ff6eb7c04bf2480450510de0ff24fbeae1fe25 (diff) | |
download | percent-encoding-android12L-d2-s7-release.tar.gz |
Generate apex_available from c2a instead of a patch am: df5e894296 am: 8c1a78df60 am: 043907a4a5 am: e8ff6eb7c0android-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/percent-encoding/+/1689910
Change-Id: Ia1a896ae1de53e9cc94e39e2dd5d06c02a9e25ab
-rw-r--r-- | Android.bp | 3 | ||||
-rw-r--r-- | cargo2android.json | 11 | ||||
-rw-r--r-- | patches/Android.bp.patch | 14 |
3 files changed, 13 insertions, 15 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --run --device --dependencies --tests --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 { default_applicable_licenses: [ diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..911c36f --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,11 @@ +{ + "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/patches/Android.bp.patch b/patches/Android.bp.patch deleted file mode 100644 index 57a0a05..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 69f4d37..8421e0b 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -6,4 +6,9 @@ rust_library { - crate_name: "percent_encoding", - srcs: ["lib.rs"], - edition: "2015", -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.resolv", -+ ], -+ min_sdk_version: "29", - } |