aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-08 17:18:32 +0000
committerAndrew Walbran <qwandor@google.com>2023-11-08 17:18:32 +0000
commit2b68c7ca5a9925161884451f84edbd069c2116b2 (patch)
tree6a72bdf24002eb4d64ecc8ef72f5c9c4559c3b19
parent9f3c8314bb3860cbec78459f4321f1317c09ae5a (diff)
downloadcesu8-2b68c7ca5a9925161884451f84edbd069c2116b2.tar.gz
Migrate to cargo_embargo.
Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I19d40f52a4281d68b9ac9b6501308b098f4098e8
-rw-r--r--Android.bp4
-rw-r--r--cargo2android.json10
-rw-r--r--cargo_embargo.json9
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
+}