diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 21:19:46 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 21:19:46 +0000 |
commit | 7302122bd447a473494c263b19f5cbbdd661403d (patch) | |
tree | 8ce667ee5183e2c095c2c78b93c815bf3f1f7fdf | |
parent | 3bffca16fb5808fd65f5d93817108784065b3efd (diff) | |
parent | f63045e4f313b2444a333e363bf7e5c6721a2cb5 (diff) | |
download | tinyvec_macros-7302122bd447a473494c263b19f5cbbdd661403d.tar.gz |
Generate apex_available from c2a instead of a patch am: f63045e4f3android-s-beta-4android-s-beta-3android-s-beta-4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tinyvec_macros/+/1689922
Change-Id: Id42e40288e4738801079960532f58c71a3f5773c
-rw-r--r-- | Android.bp | 6 | ||||
-rw-r--r-- | cargo2android.json | 11 | ||||
-rw-r--r-- | patches/Android.bp.diff | 16 |
3 files changed, 16 insertions, 17 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --run --device --dependencies --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: [ @@ -57,6 +58,9 @@ rust_defaults { rust_test_host { name: "tinyvec_macros_host_test_src_lib", defaults: ["tinyvec_macros_defaults"], + test_options: { + unit_test: true, + }, } rust_test { diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..911c36f --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,11 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.resolv" + ], + "dependencies": true, + "device": true, + "min-sdk-version": "29", + "run": true, + "tests": true +}
\ No newline at end of file diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff deleted file mode 100644 index 2615117..0000000 --- a/patches/Android.bp.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 0285c46..0c3dae9 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -6,6 +6,11 @@ rust_library { - crate_name: "tinyvec_macros", - srcs: ["src/lib.rs"], - edition: "2018", -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.resolv", -+ ], -+ min_sdk_version: "29", - } - - rust_defaults { |