aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-04-28 22:34:22 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-28 22:34:22 +0000
commite3646b0bc6de05be77864f13b9e587a465a06be3 (patch)
treea37d77a527c577f11a2c00f84694c9fd47b5617b
parent11755b3b32a01f165cec0921f34202e133f86bbe (diff)
parentdcd7fa19f594224dda8ec327473448164332b258 (diff)
downloaditoa-e3646b0bc6de05be77864f13b9e587a465a06be3.tar.gz
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/itoa/+/1689105 Change-Id: Iee6de06cb0d914486e19f81bbdf0440c6c290824
-rw-r--r--Android.bp3
-rw-r--r--cargo2android.json9
-rw-r--r--patches/Android.bp.patch13
3 files changed, 11 insertions, 14 deletions
diff --git a/Android.bp b/Android.bp
index a90a620..f49b03d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --device --dependencies.
+// 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: ["external_rust_crates_itoa_license"],
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.patch b/patches/Android.bp.patch
deleted file mode 100644
index 1394742..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index cf4bc93..1e6793a 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -10,4 +10,8 @@ rust_library {
- "default",
- "std",
- ],
-+ apex_available: [
-+ "//apex_available:platform",
-+ "com.android.virt",
-+ ],
- }