Snap for 11104212 from da042a5f4242e7db6b8dcaddaf05990864cdd94c to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I63b604e4ca58752c3ee0c69e806ed0243e2aa015

3 files changed, 61 insertions, 50 deletions

diff --git a/Android.bp b/Android.bp
index b8d60b6..6f49fb3 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 {
@@ -60,33 +60,6 @@ rust_library {
     min_sdk_version: "29",
 }
 
-rust_library_rlib {
-    name: "libonce_cell_nostd",
-    crate_name: "once_cell",
-    cargo_env_compat: true,
-    cargo_pkg_version: "1.17.1",
-    srcs: ["src/lib.rs"],
-    edition: "2021",
-    features: [
-        "alloc",
-        "race",
-    ],
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    prefer_rlib: true,
-    no_stdlibs: true,
-    stdlibs: [
-        "liballoc.rust_sysroot",
-        "libcompiler_builtins.rust_sysroot",
-        "libcore.rust_sysroot",
-    ],
-    product_available: true,
-    vendor_available: true,
-    min_sdk_version: "29",
-}
-
 rust_test {
     name: "once_cell_test_src_lib",
     host_supported: true,
@@ -139,3 +112,30 @@ rust_test {
         "libregex",
     ],
 }
+
+rust_library_rlib {
+    name: "libonce_cell_nostd",
+    crate_name: "once_cell",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.17.1",
+    srcs: ["src/lib.rs"],
+    edition: "2021",
+    features: [
+        "alloc",
+        "race",
+    ],
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    prefer_rlib: true,
+    no_stdlibs: true,
+    stdlibs: [
+        "liballoc.rust_sysroot",
+        "libcompiler_builtins.rust_sysroot",
+        "libcore.rust_sysroot",
+    ],
+    product_available: true,
+    vendor_available: true,
+    min_sdk_version: "29",
+}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index dcdc20f..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "dependencies": true,
-  "dependency-blocklist": [
-    "critical_section"
-  ],
-  "device": true,
-  "min-sdk-version": "29",
-  "run": true,
-  "variants": [
-    {
-      "tests": true
-    },
-    {
-      "alloc": true,
-      "features": "alloc,race",
-      "force-rlib": true,
-      "no-host": true,
-      "suffix": "_nostd",
-      "no-std": true
-    }
-  ]
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..d9268f7
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,33 @@
+{
+  "min_sdk_version": "29",
+  "package": {
+    "once_cell": {
+      "dep_blocklist": [
+        "libcritical_section"
+      ]
+    }
+  },
+  "run_cargo": false,
+  "variants": [
+    {
+      "tests": true
+    },
+    {
+      "features": [
+        "alloc",
+        "race"
+      ],
+      "module_name_overrides": {
+        "libonce_cell": "libonce_cell_nostd"
+      },
+      "package": {
+        "once_cell": {
+          "alloc": true,
+          "force_rlib": true,
+          "host_supported": false,
+          "no_std": true
+        }
+      }
+    }
+  ]
+}