diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:10:42 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:10:42 +0000 |
commit | ed39197f0703bb6536caa7bf067040d7008a6395 (patch) | |
tree | 18fc2dad0caf21a0589f5e2622ba8c4e83b6031f | |
parent | 1280ca5ea6ce05ee3b578a6a66473ff287745d9e (diff) | |
parent | 08d47934b0ceb5efc8e66c3099a06887b770b7a0 (diff) | |
download | cfg-if-android12-qpr3-s2-release.tar.gz |
Generate apex_available from c2a instead of a patch am: d0234f2bbf am: 256379a292 am: 08d47934b0android-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/cfg-if/+/1688622
Change-Id: I893b22b8603b74f4f240a4f2e13c3f5bc619a8e9
-rw-r--r-- | Android.bp | 9 | ||||
-rw-r--r-- | cargo2android.json | 12 | ||||
-rw-r--r-- | patches/Android.bp.patch | 15 |
3 files changed, 20 insertions, 16 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --run --dependencies --tests --device --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: ["external_rust_crates_cfg-if_license"], @@ -48,6 +49,9 @@ rust_defaults { rust_test_host { name: "cfg-if_host_test_src_lib", defaults: ["cfg-if_defaults"], + test_options: { + unit_test: true, + }, } rust_test { @@ -70,6 +74,9 @@ rust_defaults { rust_test_host { name: "cfg-if_host_test_tests_xcrate", defaults: ["cfg-if_defaults_xcrate"], + test_options: { + unit_test: true, + }, } rust_test { diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..5412b5b --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,12 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.resolv", + "com.android.virt" + ], + "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 083dd17..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 78c65e6..82b7964 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -47,4 +47,10 @@ rust_library { - crate_name: "cfg_if", - srcs: ["src/lib.rs"], - edition: "2018", -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.resolv", -+ "com.android.virt", -+ ], -+ min_sdk_version: "29", - } |