Snap for 11078623 from 8a2499156115c043f739034522f5f38a0253a9c5 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: Ib7ac758413cf8afcbe004a6f7b87b52a50b8dc8d

4 files changed, 29 insertions, 15 deletions

diff --git a/Android.bp b/Android.bp
index 9db64b6..94b1d10 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 {
@@ -45,9 +45,7 @@ rust_library_rlib {
     cargo_pkg_version: "0.3.1",
     srcs: ["src/lib.rs"],
     edition: "2015",
-    rustlibs: [
-        "libforeign_types_shared",
-    ],
+    rustlibs: ["libforeign_types_shared"],
     apex_available: [
         "//apex_available:platform",
         "com.android.compos",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 94e72b7..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.compos",
-    "com.android.virt"
-  ],
-  "device": true,
-  "force-rlib": true,
-  "run": true,
-  "vendor-available": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..f93ab69
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,13 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.compos",
+    "com.android.virt"
+  ],
+  "package": {
+    "foreign-types": {
+      "force_rlib": true
+    }
+  },
+  "run_cargo": false
+}
diff --git a/rules.mk b/rules.mk
new file mode 100644
index 0000000..c4b600c
--- /dev/null
+++ b/rules.mk
@@ -0,0 +1,14 @@
+# This file is generated by cargo2rulesmk.py --run --features .
+# Do not modify this file as changes will be overridden on upgrade.
+
+LOCAL_DIR := $(GET_LOCAL_DIR)
+MODULE := $(LOCAL_DIR)
+MODULE_CRATE_NAME := foreign_types
+MODULE_SRCS := \
+	$(LOCAL_DIR)/src/lib.rs \
+
+MODULE_RUST_EDITION := 2015
+MODULE_LIBRARY_DEPS := \
+	external/rust/crates/foreign-types-shared \
+
+include make/library.mk