aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-14 13:18:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-14 13:18:54 +0000
commit80910b6f51943dfd6b3a54e1c2a7eebe1eac4dcc (patch)
treee288fda2df1cf42dc5d662ffe308fa2e1e64f87b
parentfeb9f59a9f1ecb1653849d916b0332ad2971ac0b (diff)
parentdaee3bb07632ebf754997b8a7115acd3d53f8508 (diff)
downloadprotobuf-parse-80910b6f51943dfd6b3a54e1c2a7eebe1eac4dcc.tar.gz
Migrate to cargo_embargo. am: daee3bb076
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/protobuf-parse/+/2828050 Change-Id: Ibe4ab4af42def49eaf976c0ccc8737e1420009a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
-rw-r--r--cargo2android.json5
-rw-r--r--cargo_embargo.json3
3 files changed, 4 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp
index b0cac87..e7db97d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
-// 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 {
default_applicable_licenses: [
"external_rust_crates_protobuf-parse_license",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 81b61d1..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "dependencies": true,
- "device": true,
- "run": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..cb908d7
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,3 @@
+{
+ "run_cargo": false
+}