aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-04-28 22:10:40 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-28 22:10:40 +0000
commitb4d4d09d0da1e1d6f55aac65a242d7e3aa5f482e (patch)
tree3bd9375068a14132a49e5f30afab363dd976f9d9
parent39187a39bfe11c4d2e96727c25f4432f4af984ee (diff)
parentd3dec2432895844439f4f9c8c8cb1df9764b7fff (diff)
downloadtextwrap-android12-qpr3-s4-release.tar.gz
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/textwrap/+/1689920 Change-Id: I20734ac116ec6580450833d9b91516160b5a079a
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json10
-rw-r--r--patches/Android.bp.patch13
3 files changed, 11 insertions, 14 deletions
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",
-+ ],
- }