aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-14 00:39:29 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-14 00:39:29 +0000
commit7cbd7caa94e93a152d1bb7c96ea89e31b11d5972 (patch)
tree99684c7b9dd2e84bf1178129da61e95c5eeb6627
parentbbe593c76f3098c06592c50ac5e7f8b0f2e4d066 (diff)
parentc15bd3ae8d12ac6aa956d1f25d4147efab91f6bb (diff)
downloadprotobuf-json-mapping-7cbd7caa94e93a152d1bb7c96ea89e31b11d5972.tar.gz
Migrate to cargo_embargo. am: c15bd3ae8d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/protobuf-json-mapping/+/2822213 Change-Id: I8715c3b6debbaf795edc2d6ec1e21c98755930f4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json5
-rw-r--r--cargo_embargo.json4
3 files changed, 5 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp
index c9b6504..49fe9d8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo_embargo.
// Do not modify this file as changes will be overridden on upgrade.
package {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index aefb658..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "run": true,
- "device": true,
- "tests": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..c8842d1
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,4 @@
+{
+ "run_cargo": false,
+ "tests": true
+}