diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 08:18:22 -0700 |
---|---|---|
committer | Joel Galenson <jgalenson@google.com> | 2021-04-28 08:18:22 -0700 |
commit | 90e6ca2b7e9a388606a0c1add146eb6f423f1925 (patch) | |
tree | 588cd6bcab99f86ee21c4a232729119123f985a6 | |
parent | c0ed4fc02d1ff4660210889343ce304524e23502 (diff) | |
download | pin-utils-90e6ca2b7e9a388606a0c1add146eb6f423f1925.tar.gz |
Generate apex_available from c2a instead of a patchandroid-s-beta-2android-s-beta-1
Test: Run c2a
Test: Build
Change-Id: I8d3e6865d8831285f1d818c0c934d8cde19a1ff9
-rw-r--r-- | Android.bp | 12 | ||||
-rw-r--r-- | cargo2android.json | 10 | ||||
-rw-r--r-- | patches/Android.bp.patch | 15 |
3 files changed, 21 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_pin-utils_license"], @@ -60,6 +61,9 @@ rust_defaults { rust_test_host { name: "pin-utils_host_test_src_lib", defaults: ["pin-utils_defaults"], + test_options: { + unit_test: true, + }, } rust_test { @@ -82,6 +86,9 @@ rust_test_host { name: "pin-utils_host_test_tests_projection", defaults: ["pin-utils_defaults_pin_utils"], srcs: ["tests/projection.rs"], + test_options: { + unit_test: true, + }, } rust_test { @@ -94,6 +101,9 @@ rust_test_host { name: "pin-utils_host_test_tests_stack_pin", defaults: ["pin-utils_defaults_pin_utils"], srcs: ["tests/stack_pin.rs"], + 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 e0a17ea..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 0a15bc2..65d2df4 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -6,6 +6,10 @@ rust_library { - crate_name: "pin_utils", - srcs: ["src/lib.rs"], - edition: "2018", -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } - - rust_defaults { |