aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-12-15 18:06:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-12-15 18:06:48 +0000
commit43a1f64afa8144029befcfee0e8fb6cefb24eecc (patch)
treedd03fe8bd09b6da66940a0b0d51b036313884ae6
parent407bc2b8966fbe0af13d3b72b649bfa9976a98ec (diff)
parent7a45709ccb6813d6b74518de0ea793466d272550 (diff)
downloadgrpcio-43a1f64afa8144029befcfee0e8fb6cefb24eecc.tar.gz
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 361c36ce17 am: a3f93973af am: 5c09329f71 am: 7a45709ccb
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/grpcio/+/1912437 Change-Id: Ia549370aaa6ff4251a3cef9f4dc53326d2a680cf
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json5
2 files changed, 6 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index f532453..d4d4930 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --features=protobuf,protobuf-codec.
+// 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..5af2dde
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,5 @@
+{
+ "device": true,
+ "features": "protobuf,protobuf-codec",
+ "run": true
+} \ No newline at end of file