diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 08:12:26 -0700 |
---|---|---|
committer | Joel Galenson <jgalenson@google.com> | 2021-04-28 08:12:26 -0700 |
commit | 1d14c688e429733b83eac5485c1e9430c5f70372 (patch) | |
tree | 97dd6d3c95a35b14f69cb5366b898f6dbe520a45 | |
parent | 98c808272da11f701ef3ccc42bbff79dc2a8c341 (diff) | |
download | pin-project-lite-1d14c688e429733b83eac5485c1e9430c5f70372.tar.gz |
Generate apex_available from c2a instead of a patch
Test: Run c2a
Test: Build
Change-Id: I7bc60000a63b4e569379d2c1607dc48522a50624
-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", -+ ], - } |