diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 21:52:41 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 21:52:41 +0000 |
commit | 0aa588c4efdacd4a30dfaf8fc5d33661b1d14667 (patch) | |
tree | 64f2ae53f5b4a2f6c3ae21646c46d1b20ceb36d7 | |
parent | f432529ef6c142d11f0f965584158b388ac950da (diff) | |
parent | b094af202c4b34fba9f622970bac77c3eb2e8a55 (diff) | |
download | futures-task-0aa588c4efdacd4a30dfaf8fc5d33661b1d14667.tar.gz |
Merge "Generate apex_available from c2a instead of a patch" am: dbf6b615c0 am: b094af202c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-task/+/1688807
Change-Id: I816c779029359f54b95b3638878d28124cdcabe6
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | cargo2android.json | 10 | ||||
-rw-r--r-- | patches/Android.bp.patch | 13 |
3 files changed, 11 insertions, 14 deletions
@@ -1,4 +1,4 @@ -// 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 { 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 5934877..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 76ef162..18bac85 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -79,4 +75,8 @@ rust_library { - "default", - "std", - ], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } |