Snap for 11139387 from bf7e1484f16bc73af6da3da11d04e38d5b40f962 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I9bba6fc3a1700d1ec45239a0bb0839b784b8b014

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"
+    }
+  }
+}