Merge "Migrate to cargo_embargo." into main

3 files changed, 11 insertions, 17 deletions

diff --git a/Android.bp b/Android.bp
index 86d4b8e..df86c52 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 {
@@ -40,7 +40,6 @@ license {
 
 rust_library {
     name: "libunicode_bidi",
-    // has rustc warnings
     host_supported: true,
     crate_name: "unicode_bidi",
     cargo_env_compat: true,
@@ -63,7 +62,6 @@ rust_library {
 
 rust_test {
     name: "unicode-bidi_test_src_lib",
-    // has rustc warnings
     host_supported: true,
     crate_name: "unicode_bidi",
     cargo_env_compat: true,
@@ -80,7 +78,5 @@ rust_test {
         "hardcoded-data",
         "std",
     ],
-    rustlibs: [
-        "libserde_test",
-    ],
+    rustlibs: ["libserde_test"],
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 911c36f..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.resolv"
-  ],
-  "dependencies": true,
-  "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..b8ed541
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,9 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.resolv"
+  ],
+  "min_sdk_version": "29",
+  "run_cargo": false,
+  "tests": true
+}