aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-11-14 15:13:07 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-14 15:13:07 +0000
commit5fe1b35497fac2780a3cc206a050029eb4f6104f (patch)
tree8c09d231746162810f31022c7191b09e32fc7856
parentfc73901fd0c56c6220648b583c9f8f9934ce40e3 (diff)
parenta28a75e883a06f4d384b555e6a6f9c73bb8e875a (diff)
downloadbitflags-5fe1b35497fac2780a3cc206a050029eb4f6104f.tar.gz
Merge "Migrate to cargo_embargo." into main am: a28a75e883
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/bitflags/+/2822237 Change-Id: I278b5e58f15ac7ad7f968f79d80e395d7fa11550 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json8
-rw-r--r--cargo_embargo.json11
3 files changed, 12 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp
index 6d4d347..d6d6e28 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 bc0ef74..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "dependency-blocklist": [
- "trybuild"
- ],
- "device": true,
- "min-sdk-version": "29",
- "run": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..9ce3b17
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,11 @@
+{
+ "min_sdk_version": "29",
+ "package": {
+ "bitflags": {
+ "dep_blocklist": [
+ "libtrybuild"
+ ]
+ }
+ },
+ "run_cargo": false
+}