commit 6e441525c01217b2ed15402ec80e217980849b4e
author Andrew Walbran <qwandor@google.com> Wed Nov 08 22:49:53 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 08 22:49:53 2023 +0000
tree 6a72bdf24002eb4d64ecc8ef72f5c9c4559c3b19
parent 51654092fd33c89d1a954ea0089d139a0b13b912
parent c6dc74b02f2e0045fc4a82ca908dc2108863e573

Migrate to cargo_embargo. am: 2b68c7ca5a am: 279eca3c46 am: c6dc74b02f

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cesu8/+/2822395

Change-Id: Ibb06d146538b73045a660f0070b90a8c58c7a131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

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 @@
 
 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_library {
     name: "libcesu8",
-    // has rustc warnings
     host_supported: true,
     crate_name: "cesu8",
     cargo_env_compat: true,

cargo2android.json

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

cargo_embargo.json

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
+}