Snap for 11117647 from 193ed8eca84dbd5c5d124974c3ff01f86c13a278 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: Ibb2362dc3e668d9d2a96271be3f17be25976accf

3 files changed, 14 insertions, 14 deletions

diff --git a/Android.bp b/Android.bp
index 68c54b6..1ba86d6 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 {
@@ -57,7 +57,6 @@ genrule {
 
 rust_library {
     name: "libvulkano",
-    // has rustc warnings
     host_supported: true,
     crate_name: "vulkano",
     cargo_env_compat: true,
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 9a5297d..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "copy-out": true,
-  "device": true,
-  "no-presubmit": true,
-  "run": true,
-  "tests": false,
-  "features": ""
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..1f59f23
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,13 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "features": [],
+  "package": {
+    "vulkano": {
+      "copy_out": true,
+      "no_presubmit": true
+    }
+  }
+}