Generate apex_available from c2a instead of a patch am: daceeab774 am: b4ad798bd2 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/textwrap/+/1689920 Change-Id: I855ebc9c778134d0b225a338544c0e07e210deb1
diff --git a/Android.bp b/Android.bp index 328395c..d988603 100644 --- a/Android.bp +++ b/Android.bp
@@ -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", -+ ], - }