aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Farrell <jamesfarrell@google.com>2023-09-12 03:54:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-09-12 03:54:58 +0000
commit14d8235fc8410c1a2e5289f8bc8d6955e69d2b36 (patch)
tree3ab93386bcb6fdd064e8939b3386dc99859eb4f8
parent98b5d423bb7e7084e6998683bd2d7c70c29c410c (diff)
parent94d0f754e5e196fc5a2eaea99c238150ccb9d8c9 (diff)
downloadprotobuf-json-mapping-14d8235fc8410c1a2e5289f8bc8d6955e69d2b36.tar.gz
Add cargo2android.json am: 8ae15e253e am: aa7ad21b5d am: bbe593c76f am: fe07b1eb5b am: 94d0f754e5
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/protobuf-json-mapping/+/2744718 Change-Id: Ibb3be6e2a1aaa9cee7b0e7b0da2178ef55c0a2b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
-rw-r--r--cargo2android.json5
2 files changed, 6 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index 37d494f..c9b6504 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
-// This file is generated by cargo2android.py --run --device --tests.
+// 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_protobuf-json-mapping_license",
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..aefb658
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,5 @@
+{
+ "run": true,
+ "device": true,
+ "tests": true
+}