diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:34:23 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:34:23 +0000 |
commit | 7f65200258a009a9b4d8c31bd98e73211834efba (patch) | |
tree | 95d23281f1be722c5e7ff14d322b70b0a5120db1 | |
parent | 83e5189fc731afa9951736802f2d3ece7f06327c (diff) | |
parent | 7ff3771e08c8986974cba124dcccb529c8f78fc9 (diff) | |
download | slab-7f65200258a009a9b4d8c31bd98e73211834efba.tar.gz |
Generate apex_available from c2a instead of a patch am: b29dfafb7d am: c220647ac7 am: a72eba52b1 am: 7ff3771e08android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-release
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/slab/+/1690025
Change-Id: Id83ffaa0f6e4b359752f215efb3b3b9195d073a9
-rw-r--r-- | Android.bp | 9 | ||||
-rw-r--r-- | cargo2android.json | 10 | ||||
-rw-r--r-- | patches/Android.bp.patch | 15 |
3 files changed, 18 insertions, 16 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_slab_license"], @@ -41,6 +42,9 @@ rust_defaults { rust_test_host { name: "slab_host_test_src_lib", defaults: ["slab_defaults"], + test_options: { + unit_test: true, + }, } rust_test { @@ -63,6 +67,9 @@ rust_defaults { rust_test_host { name: "slab_host_test_tests_slab", defaults: ["slab_defaults_slab"], + test_options: { + unit_test: true, + }, } rust_test { 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 acfab60..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 81236b0..18997c4 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -6,6 +6,10 @@ rust_library { - crate_name: "slab", - srcs: ["src/lib.rs"], - edition: "2015", -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } - - rust_defaults { |