aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-14 01:10:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-14 01:10:09 +0000
commit04c03c0924032cfefd1e20da3f09873a3475b22b (patch)
tree99684c7b9dd2e84bf1178129da61e95c5eeb6627
parent94d0f754e5e196fc5a2eaea99c238150ccb9d8c9 (diff)
parent016fa9a5326d5bd385ba82d1e70e622e81087677 (diff)
downloadprotobuf-json-mapping-04c03c0924032cfefd1e20da3f09873a3475b22b.tar.gz
Migrate to cargo_embargo. am: c15bd3ae8d am: 016fa9a532
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/protobuf-json-mapping/+/2822213 Change-Id: Ie65da15af31e7479fb560897476df701b0794026 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
+}