diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:10:40 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:10:40 +0000 |
commit | 8ceb2c6d3b4581740ffa5fa857a2023b8f3985e5 (patch) | |
tree | 79f389b1c65ee3eae9d26f714053ca0f19be4752 | |
parent | 22ef9633be95ccf55361f0aa37b103b62b2687e2 (diff) | |
parent | 860c039a4f9fb8ee3cda0976cbeceab50cf9c18f (diff) | |
download | bitflags-android12-dev.tar.gz |
Generate apex_available from c2a instead of a patch am: 89e0a889bc am: b772c12c88 am: 860c039a4fandroid-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/bitflags/+/1688686
Change-Id: I7c211d2e3f34ba07edff5d35d6d9160b97e9a574
-rw-r--r-- | Android.bp | 14 | ||||
-rw-r--r-- | cargo2android.json | 10 | ||||
-rw-r--r-- | patches/Android.bp.patch | 13 |
3 files changed, 17 insertions, 20 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --run --dependencies --device --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: ["external_rust_crates_bitflags_license"], @@ -45,14 +46,15 @@ rust_defaults { auto_gen_config: true, edition: "2015", features: ["default"], - flags: [ - "--cfg bitflags_const_fn", - ], + cfgs: ["bitflags_const_fn"], } rust_test_host { name: "bitflags_host_test_src_lib", defaults: ["bitflags_defaults"], + test_options: { + unit_test: true, + }, } rust_test { @@ -68,9 +70,7 @@ rust_library { srcs: ["src/lib.rs"], edition: "2015", features: ["default"], - flags: [ - "--cfg bitflags_const_fn", - ], + cfgs: ["bitflags_const_fn"], apex_available: [ "//apex_available:platform", "com.android.virt", diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..ac56e26 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,10 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], + "dependencies": true, + "device": true, + "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 580673c..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 30e65f1..3234f17 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -39,4 +39,8 @@ rust_library { - flags: [ - "--cfg bitflags_const_fn", - ], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } |