aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-13 19:06:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-13 19:06:58 +0000
commit0b3b68c4cf117f1e773c72f807c2552bf382c8bd (patch)
treea1340a72fda5dbfb0377b9e61b9b4e2492f32104
parenta32cf60cac8d1d04913b4dd3f0633bb4226536dc (diff)
parent89cbd19945e99d1255c6bfea2e5b7621100b9526 (diff)
downloaduserfaultfd-0b3b68c4cf117f1e773c72f807c2552bf382c8bd.tar.gz
Migrate to cargo_embargo. am: 89cbd19945
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/userfaultfd/+/2828091 Change-Id: I2f97d6af1e1540a889f893c3c29807d6dac5dc8d 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 c5f37ac..f497e56 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
+}