Snap for 11078623 from 84f0cded872ea3444ad5e5179e80bcc0c97c0841 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: Ie59ed64e2e53c3358a4b61ce038a2f12a8a8a851

4 files changed, 25 insertions, 12 deletions

diff --git a/Android.bp b/Android.bp
index 6465378..709a55f 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 {
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..4747e56
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,13 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.compos",
+    "com.android.virt"
+  ],
+  "package": {
+    "foreign-types-shared": {
+      "force_rlib": true
+    }
+  },
+  "run_cargo": false
+}
diff --git a/rules.mk b/rules.mk
new file mode 100644
index 0000000..8eed856
--- /dev/null
+++ b/rules.mk
@@ -0,0 +1,11 @@
+# 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_shared
+MODULE_SRCS := \
+	$(LOCAL_DIR)/src/lib.rs \
+
+MODULE_RUST_EDITION := 2015
+include make/library.mk