diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 09:18:03 -0700 |
---|---|---|
committer | Joel Galenson <jgalenson@google.com> | 2021-04-28 09:18:03 -0700 |
commit | daceeab7740ff06c20166ca68ef885e0053b1e6b (patch) | |
tree | 3bd9375068a14132a49e5f30afab363dd976f9d9 | |
parent | a65267afe9568cef50669423d216f9d5def2feb1 (diff) | |
download | textwrap-daceeab7740ff06c20166ca68ef885e0053b1e6b.tar.gz |
Generate apex_available from c2a instead of a patch
Test: Run c2a
Test: Build
Change-Id: I1e6cf10db50fe1e1626fbffafbc5a6b60d0a3fc8
-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 --features= --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..b933b33 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,10 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], + "dependencies": true, + "device": true, + "features": "", + "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 356e1c2..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index f879002..893238d 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -7,4 +7,8 @@ rust_library { - crate_name: "textwrap", - srcs: ["src/lib.rs"], - edition: "2018", -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } |