aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-21 16:41:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-21 16:41:09 +0000
commit668045ad3211a1df6b5d44522710215040d13c68 (patch)
treefbe0255e83a14528bae1aea36cad8d21e532deda
parent941b72dc456ccf85f4237fa0e19cff4f896e74ee (diff)
parent756447bd7b0a4dd760e3ebfdf8db6170f67dd7db (diff)
downloadgdbstub-668045ad3211a1df6b5d44522710215040d13c68.tar.gz
Migrate to cargo_embargo. am: 4fba66ab76 am: 756447bd7b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/gdbstub/+/2841313 Change-Id: Ia6764178d4f94fb44dd1fa638912973d2035dba7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json7
-rw-r--r--cargo_embargo.json6
3 files changed, 7 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp
index a241d18..df5246e 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 1d152ce..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "device": true,
- "run": true,
- "dep-suffixes": {
- "bitflags": "-1.3.2"
- }
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..99df43f
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,6 @@
+{
+ "module_name_overrides": {
+ "libbitflags": "libbitflags-1.3.2"
+ },
+ "run_cargo": false
+}