diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 16:24:35 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 16:24:35 +0000 |
commit | cfce8549e806f6f272f6d9a372044dd249f50c9f (patch) | |
tree | 3ec477d7b01067633da10d4b2a1808b463f2e281 | |
parent | 2d45ccb969212d8ec4a28c15fd26601dd8b9ca6e (diff) | |
parent | 02498447ebcda3e35763d8d752b42d4e6ea765a9 (diff) | |
download | matches-cfce8549e806f6f272f6d9a372044dd249f50c9f.tar.gz |
Generate apex_available from c2a instead of a patch am: be4e5d71f3 am: ccbbe19eec am: c8c5a0525c am: 02498447eb
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/matches/+/1686945
Change-Id: I6bc1ea0a7ed4200c86e039156bd5d674620f7a3f
-rw-r--r-- | Android.bp | 3 | ||||
-rw-r--r-- | cargo2android.json | 11 | ||||
-rw-r--r-- | patches/Android.bp.patch | 16 |
3 files changed, 13 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: ["external_rust_crates_matches_license"], 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.patch b/patches/Android.bp.patch deleted file mode 100644 index d7fd1ba..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index de4144e..dc2efcc 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -7,6 +7,11 @@ rust_library { - crate_name: "matches", - srcs: ["lib.rs"], - edition: "2015", -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.resolv", -+ ], -+ min_sdk_version: "29", - } - - rust_defaults { |