Snap for 11097608 from e2a71c3618b3a91025a780a49c949dec09781435 to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r28android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: Ied052c915fff2e90bf84eb7db7702b3fa75213d3

3 files changed, 12 insertions, 12 deletions

diff --git a/Android.bp b/Android.bp
index 3ac933a..e94e37c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
-// 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.
 
-
-
 rust_library_rlib {
     name: "libsmccc",
     crate_name: "smccc",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index c78127b..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "dependencies": true,
-  "device": true,
-  "force-rlib": true,
-  "no-host": true,
-  "no-std": true,
-  "run": true,
-  "tests": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..e3c9cb8
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,11 @@
+{
+  "package": {
+    "smccc": {
+      "force_rlib": true,
+      "host_supported": false,
+      "no_std": true
+    }
+  },
+  "run_cargo": false,
+  "tests": true
+}