diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-04-28 21:52:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 21:52:39 +0000 |
| commit | a87de93277df479281d1f2650df9121cc4489b6b (patch) | |
| tree | da2c1c8ccc04febb2db96fb78408a2f1335d4656 | |
| parent | a66c7ed1fed0c4e755d8f34e4594951d406afb48 (diff) | |
| parent | cda0442d5281527aa49c2ccd9d000d7d7850fd34 (diff) | |
| download | futures-sink-a87de93277df479281d1f2650df9121cc4489b6b.tar.gz | |
Generate apex_available from c2a instead of a patch am: 6a34237310 am: cda0442d52
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-sink/+/1688689
Change-Id: Icaeaa901c11fee915aaf28fe714faff6a7e8188e
| -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 4305fea..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index a740016..b16050a 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -35,4 +35,8 @@ rust_library { - "default", - "std", - ], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } |