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 | 9bd447a74807cab224ff3d39cb07d45cbcf6d2f6 (patch) | |
tree | 71c77aba563c644c5294b9326b518692929b3d44 | |
parent | 5c4dc3f8a058d627249f5854a6bab5bea53779bc (diff) | |
parent | ab288305778efaf40b4f396dd8a2e6df091bd152 (diff) | |
download | once_cell-android12-dev.tar.gz |
Merge "Generate apex_available from c2a instead of a patch" am: c4379c47f7 am: c46660d000 am: ab28830577android-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/once_cell/+/1689909
Change-Id: I10cd90bace17191e942c9e2cf3a12b602c6c7e52
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | cargo2android.json | 11 | ||||
-rw-r--r-- | patches/Android.bp.patch | 17 |
3 files changed, 12 insertions, 18 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 { diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..2e8c0ea --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,11 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.resolv", + "com.android.virt" + ], + "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 9a416e4..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index f122044..eb9a51f 100644 ---- a/Android.bp -+++ b/Android.bp - rust_library { - name: "libonce_cell", -@@ -11,4 +11,10 @@ rust_library { - "default", - "std", - ], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.resolv", -+ "com.android.virt", -+ ], -+ min_sdk_version: "29", - } |