diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 21:19:43 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 21:19:43 +0000 |
commit | b772c12c884aa2b86b366575ddfe354fb1f1eca1 (patch) | |
tree | 79f389b1c65ee3eae9d26f714053ca0f19be4752 | |
parent | b6847a666fe018c3c159bad042b408b41de86de8 (diff) | |
parent | 89e0a889bc9dc1c5eaeea2a87701ae4c14d3d83e (diff) | |
download | bitflags-b772c12c884aa2b86b366575ddfe354fb1f1eca1.tar.gz |
Generate apex_available from c2a instead of a patch am: 89e0a889bc
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/bitflags/+/1688686
Change-Id: Ib29692faf2398e89d1dbf15f5dbfefa684187faf
-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", -+ ], - } |