diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:10:46 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:10:46 +0000 |
commit | b3d04ce05ee2993da60f476f0c1f609ecdd26b3f (patch) | |
tree | e17a4ce161430b07e289f79f4ebc6181dc97d89a | |
parent | 60bb1e2a2aa5c7cea99caa58da10510123c15bec (diff) | |
parent | eaaa0489c9aec77f6584f7b00f86e0e2303c1054 (diff) | |
download | idna-b3d04ce05ee2993da60f476f0c1f609ecdd26b3f.tar.gz |
Generate apex_available from c2a instead of a patch am: 798c708a18 am: 0a01c5a1c8 am: eaaa0489c9android-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/idna/+/1688778
Change-Id: Id951e4f9b314a783c81d6bf83ac0961ac4bd39e9
-rw-r--r-- | Android.bp | 6 | ||||
-rw-r--r-- | cargo2android.json | 10 | ||||
-rw-r--r-- | patches/Android.bp.patch | 16 |
3 files changed, 13 insertions, 19 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies --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 { @@ -57,7 +57,7 @@ rust_library { // dependent_library ["feature_list"] // matches-0.1.8 -// tinyvec-1.1.1 "alloc,default,tinyvec_macros" +// tinyvec-1.2.0 "alloc,default,tinyvec_macros" // tinyvec_macros-0.1.0 -// unicode-bidi-0.3.4 "default" +// unicode-bidi-0.3.5 "default" // unicode-normalization-0.1.17 "default,std" diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..f9f13d4 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,10 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.resolv" + ], + "dependencies": true, + "device": true, + "min-sdk-version": "29", + "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 64073b3..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 45d877a..5de8f15 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -11,6 +11,11 @@ rust_library { - "libunicode_bidi", - "libunicode_normalization", - ], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.resolv", -+ ], -+ min_sdk_version: "29", - } - - // dependent_library ["feature_list"] |