summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-22 23:13:36 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-22 23:13:36 +0000
commit556e90e8e59c24ae44d7ef3efb1d8783818b0e88 (patch)
treea25692fa3e936a6c8f304697c4dc83330368b5ad
parent991d4aea982a1406b0900b9fdb16b33fe33d71db (diff)
parent6dbb08787bc44c962b972d78ce779ccf5bb45228 (diff)
downloaduserfaultfd-sys-556e90e8e59c24ae44d7ef3efb1d8783818b0e88.tar.gz
Migrate to cargo_embargo. am: 6dbb08787b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/userfaultfd-sys/+/2835512 Change-Id: Ic2af27302d96d8d03b2204e7fa26360589b41092 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp7
-rw-r--r--cargo2android.json5
-rw-r--r--cargo_embargo.json7
3 files changed, 9 insertions, 10 deletions
diff --git a/Android.bp b/Android.bp
index 491bd2c..7695561 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 {
@@ -48,9 +48,7 @@ rust_library {
srcs: ["src/lib.rs"],
edition: "2018",
features: ["default"],
- rustlibs: [
- "libcfg_if",
- ],
+ rustlibs: ["libcfg_if"],
static_libs: ["libuserfaultfd_sys_consts"],
apex_available: [
"//apex_available:platform",
@@ -67,4 +65,3 @@ cc_library_static {
vendor_available: true,
product_available: true,
}
-
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 9373ee1..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "add-toplevel-block": "cargo2android_consts.bp",
- "device": true,
- "run": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..a4735c2
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,7 @@
+{
+ "package": {
+ "userfaultfd-sys": {
+ "add_toplevel_block": "cargo2android_consts.bp"
+ }
+ }
+}