diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:32:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:32:44 +0000 |
| commit | e92da38313774d6d6a5cf3387568d6412bb43636 (patch) | |
| tree | 97dd6d3c95a35b14f69cb5366b898f6dbe520a45 | |
| parent | 061433ad475b475c48c8e3b6873ae664b5d7e3b4 (diff) | |
| parent | 04bee9b14a717b5aad60102b105ba9778117cc59 (diff) | |
| download | pin-project-lite-e92da38313774d6d6a5cf3387568d6412bb43636.tar.gz | |
Generate apex_available from c2a instead of a patch am: 1d14c688e4 am: c86e9e3b1d am: 345ade68ee am: 04bee9b14a
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pin-project-lite/+/1689911
Change-Id: If83ade137c48002edfb5c82994a98d43821a1afc
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | cargo2android.json | 9 | ||||
| -rw-r--r-- | patches/Android.bp.diff | 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.diff. +// 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: [ 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.diff b/patches/Android.bp.diff deleted file mode 100644 index 973a233..0000000 --- a/patches/Android.bp.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 2ce3c68..c9bdf14 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -6,4 +6,8 @@ rust_library { - crate_name: "pin_project_lite", - srcs: ["src/lib.rs"], - edition: "2018", -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } |