diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 08:50:50 -0700 |
---|---|---|
committer | Joel Galenson <jgalenson@google.com> | 2021-04-28 08:50:50 -0700 |
commit | b29dfafb7d4ca784aa22e716447d01e32ccf94e2 (patch) | |
tree | 95d23281f1be722c5e7ff14d322b70b0a5120db1 | |
parent | 0a7a6d9f18fd7296da3f742c9df91e08980782e6 (diff) | |
download | slab-b29dfafb7d4ca784aa22e716447d01e32ccf94e2.tar.gz |
Generate apex_available from c2a instead of a patchandroid-s-beta-2android-s-beta-1
Test: Run c2a
Test: Build
Change-Id: I4d996e7849f369dfeebff0cccaa535cb843d39bc
-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 { |