Snap for 11111096 from e5f3986d1e740294e1dcc174b54d50e2a1fe841f to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-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-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: If4a75b26014e6936e453ce9bdcb3e2eb629081ca

3 files changed, 11 insertions, 9 deletions

diff --git a/Android.bp b/Android.bp
index db9f603..3f297c5 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_binary_host {
     name: "generate_canonical_tests",
     crate_name: "generate_canonical_tests",
@@ -594,4 +592,3 @@ cc_test_host {
         "libgtest",
     ],
 }
-
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 46d3c1a..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "run": true,
-    "host-first-multilib": true,
-    "add-toplevel-block": "cargo2android_toplevel.bp"
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..b3817ce
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,10 @@
+{
+  "package": {
+    "pdl-compiler": {
+      "add_toplevel_block": "cargo2android_toplevel.bp",
+      "device_supported": false,
+      "host_first_multilib": true
+    }
+  },
+  "run_cargo": false
+}