diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-04-28 21:52:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 21:52:45 +0000 |
| commit | ed027bc93fa78b38bc496c09b0b92592ecfdbc2d (patch) | |
| tree | b24733b7c7144c7405bc82380b5d5178a0e1b221 | |
| parent | cd041f8f80e3d9c4d43ae238bfa6296333453f28 (diff) | |
| parent | 1dcc5761cafc4e4a5bb315c83a155069774baa30 (diff) | |
| download | bytes-ed027bc93fa78b38bc496c09b0b92592ecfdbc2d.tar.gz | |
Generate apex_available from c2a instead of a patch am: b50f98162e am: 1dcc5761ca
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/bytes/+/1688667
Change-Id: I1291d95ff81a363ffce8c5a269750a46b3f442fc
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | cargo2android.json | 9 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 13 |
3 files changed, 11 insertions, 14 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --run --dependencies --device --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_bytes_license"], diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..42b7833 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,9 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], + "dependencies": true, + "device": true, + "run": true +}
\ No newline at end of file diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch deleted file mode 100644 index 2290fe4..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 16c63a4..75d6b62 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -10,4 +10,8 @@ rust_library { - "default", - "std", - ], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } |