diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:34:19 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:34:19 +0000 |
commit | 8b2e197e227fed9accd83b869cbcaa77b275e88a (patch) | |
tree | 588cd6bcab99f86ee21c4a232729119123f985a6 | |
parent | 1cea35a57af14f01346c3d30ceeb53a85b26b352 (diff) | |
parent | 59ec4d0e99748c16680f96c1d1fee3176eea6967 (diff) | |
download | pin-utils-android12L-d2-s3-release.tar.gz |
Generate apex_available from c2a instead of a patch am: 90e6ca2b7e am: 060f57b2b4 am: cd3e0aec20 am: 59ec4d0e99android-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/pin-utils/+/1689913
Change-Id: I59732eeb87b11fa438f015a16ac551d1bf1f7b2b
-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 { |