Snap for 11078623 from 758a07066edb271d71c48f21fc12d8af4c07b99d 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: I67e9c504d6ff46af63759d8e40a4e38aab77e2ab

5 files changed, 30 insertions, 16 deletions

diff --git a/Android.bp b/Android.bp
index 8711098..07a3150 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 {
@@ -65,9 +65,7 @@ rust_test {
         unit_test: true,
     },
     edition: "2018",
-    rustlibs: [
-        "libcfg_if",
-    ],
+    rustlibs: ["libcfg_if"],
 }
 
 rust_library {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index c789f3b..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "//apex_available:anyapex"
-  ],
-  "dependencies": true,
-  "device": true,
-  "min-sdk-version": "29",
-  "run": true,
-  "tests": true,
-  "vendor-available": true
-}
diff --git a/cargo2rulesmk.json b/cargo2rulesmk.json
new file mode 100644
index 0000000..6c03ee1
--- /dev/null
+++ b/cargo2rulesmk.json
@@ -0,0 +1,4 @@
+{
+    "module_add_implicit_deps": false,
+    "module_add_implicit_deps_reason": "# NOTE: This crate is a dependency of libstd, so we can't implicitly depend on\n# libstd as we would normally. The dependencies listed above are the ones\n# declared in the `Cargo.toml` when the `rustc-dep-of-std` feature is enabled."
+}
\ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..16616e0
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,5 @@
+{
+  "min_sdk_version": "29",
+  "run_cargo": false,
+  "tests": true
+}
diff --git a/rules.mk b/rules.mk
new file mode 100644
index 0000000..05bd4dd
--- /dev/null
+++ b/rules.mk
@@ -0,0 +1,19 @@
+# This file is generated by cargo2rulesmk.py --run --config cargo2rulesmk.json --features .
+# Do not modify this file as changes will be overridden on upgrade.
+
+LOCAL_DIR := $(GET_LOCAL_DIR)
+MODULE := $(LOCAL_DIR)
+MODULE_CRATE_NAME := cfg_if
+MODULE_SRCS := \
+	$(LOCAL_DIR)/src/lib.rs \
+
+# NOTE: This crate is a dependency of libstd, so we can't implicitly depend on
+# libstd as we would normally. The dependencies listed above are the ones
+# declared in the `Cargo.toml` when the `rustc-dep-of-std` feature is enabled.
+MODULE_ADD_IMPLICIT_DEPS := false
+MODULE_RUST_EDITION := 2018
+MODULE_LIBRARY_DEPS := \
+	trusty/user/base/lib/libcompiler_builtins-rust \
+	trusty/user/base/lib/libcore-rust \
+
+include make/library.mk