aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.bp12
-rw-r--r--cargo2android.json12
-rw-r--r--cargo_embargo.json15
3 files changed, 19 insertions, 20 deletions
diff --git a/Android.bp b/Android.bp
index e82a8cd..434d869 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 {
@@ -60,7 +60,7 @@ rust_test {
rust_test {
name: "arbitrary_test_tests_derive",
host_supported: true,
- crate_name: "arbitrary",
+ crate_name: "derive",
cargo_env_compat: true,
cargo_pkg_version: "1.2.3",
srcs: ["tests/derive.rs"],
@@ -74,9 +74,7 @@ rust_test {
"derive",
"derive_arbitrary",
],
- rustlibs: [
- "libarbitrary",
- ],
+ rustlibs: ["libarbitrary"],
proc_macros: ["libderive_arbitrary"],
}
@@ -93,9 +91,7 @@ rust_library_rlib {
"derive_arbitrary",
],
proc_macros: ["libderive_arbitrary"],
- apex_available: [
- "com.android.uwb",
- ],
+ apex_available: ["com.android.uwb"],
product_available: true,
vendor_available: true,
min_sdk_version: "Tiramisu",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index a784308..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "apex-available": [
- "com.android.uwb"
- ],
- "dependencies": true,
- "device": true,
- "features": "derive",
- "force-rlib": true,
- "min-sdk-version": "Tiramisu",
- "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..95080d3
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,15 @@
+{
+ "tests": true,
+ "features": [
+ "derive"
+ ],
+ "apex_available": [
+ "com.android.uwb"
+ ],
+ "min_sdk_version": "Tiramisu",
+ "package": {
+ "arbitrary": {
+ "force_rlib": true
+ }
+ }
+}