Snap for 11078623 from d149778150d845cf2f1cf086dc1eff3507d70b70 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_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I9e54903e3b1c794626baceb1d9baf49c12788893

3 files changed, 10 insertions, 13 deletions

diff --git a/Android.bp b/Android.bp
index 09fc5e5..e9a95c6 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 {
@@ -36,7 +36,6 @@ license {
 
 rust_test {
     name: "cesu8_test_src_lib",
-    // has rustc warnings
     host_supported: true,
     crate_name: "cesu8",
     cargo_env_compat: true,
@@ -52,7 +51,6 @@ rust_test {
 
 rust_library {
     name: "libcesu8",
-    // has rustc warnings
     host_supported: true,
     crate_name: "cesu8",
     cargo_env_compat: true,
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 39b0f84..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.uwb"
-  ],
-  "device": true,
-  "min-sdk-version": "29",
-  "run": true,
-  "tests": true
-}
\ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..1335e8a
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,9 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.uwb"
+  ],
+  "min_sdk_version": "29",
+  "run_cargo": false,
+  "tests": true
+}