diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:10:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:10:50 +0000 |
| commit | 018221862b96a8236b3daa90bf7003d17490fcb0 (patch) | |
| tree | 214b179b4ffa07c7969655088f3361f7650a1aa1 | |
| parent | e3a8df8ac4c09fca58d49098ebd1992ef8168a3e (diff) | |
| parent | 699554b4764ece743d671084558f12d3d54476fc (diff) | |
| download | unicode-normalization-android12-qpr3-s1-release.tar.gz | |
Generate apex_available from c2a instead of a patch am: e432fd933d am: d43d2d3679 am: 699554b476android-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/unicode-normalization/+/1689363
Change-Id: If5e6f1736509928be07fb7446a46008f15d7d100
| -rw-r--r-- | Android.bp | 5 | ||||
| -rw-r--r-- | cargo2android.json | 11 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 16 |
3 files changed, 14 insertions, 18 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: [ @@ -89,5 +90,5 @@ rust_test { } // dependent_library ["feature_list"] -// tinyvec-1.1.1 "alloc,default,tinyvec_macros" +// tinyvec-1.2.0 "alloc,default,tinyvec_macros" // tinyvec_macros-0.1.0 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 4d02544..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 9816f84..e294c9b 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -13,6 +13,11 @@ rust_library { - rustlibs: [ - "libtinyvec", - ], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.resolv", -+ ], -+ min_sdk_version: "29", - } - - rust_defaults { |