diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:10:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:10:47 +0000 |
| commit | 08507275f7b443865837f78415642365450dfd70 (patch) | |
| tree | d085eaf52ac4c533290ddfff287cc1632b2bd74f | |
| parent | 9bfe04184e113d262874a5a312530f60e98504e2 (diff) | |
| parent | 4e9379df369e909dd688233077dfe40237233213 (diff) | |
| download | lazy_static-android12-qpr3-s2-release.tar.gz | |
Generate apex_available from c2a instead of a patch am: 47baee401f am: 090b8849ae am: 4e9379df36android-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/lazy_static/+/1688648
Change-Id: I400ca505486a8ffce6dbe639575c2cedc62fe0bc
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | cargo2android.json | 12 | ||||
| -rw-r--r-- | patches/Android.bp.diff | 28 |
3 files changed, 29 insertions, 13 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --tests --patch=patches/Android.bp.diff. +// 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..929451a --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,12 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.resolv", + "com.android.virt" + ], + "device": true, + "min-sdk-version": "29", + "patch": "patches/Android.bp.diff", + "run": true, + "tests": true +}
\ No newline at end of file diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff index 213237d..e07e725 100644 --- a/patches/Android.bp.diff +++ b/patches/Android.bp.diff @@ -2,7 +2,22 @@ diff --git a/Android.bp b/Android.bp index 5033c27..843fa1c 100644 --- a/Android.bp +++ b/Android.bp -@@ -71,23 +71,6 @@ rust_defaults { +@@ -45,9 +45,6 @@ + test_suites: ["general-tests"], + auto_gen_config: true, + edition: "2015", +- rustlibs: [ +- "libdoc_comment", +- ], + } + + rust_test_host { +@@ -70,28 +67,10 @@ + auto_gen_config: true, + edition: "2015", + rustlibs: [ +- "libdoc_comment", + "liblazy_static", ], } @@ -26,14 +41,3 @@ index 5033c27..843fa1c 100644 rust_test_host { name: "lazy_static_host_test_tests_test", defaults: ["lazy_static_defaults_lazy_static"], -@@ -112,4 +95,9 @@ rust_library { - crate_name: "lazy_static", - srcs: ["src/lib.rs"], - edition: "2015", -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.resolv", -+ "com.android.virt", -+ ], -+ min_sdk_version: "29", - } |