diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-10-18 18:17:21 +0100 |
|---|---|---|
| committer | Andrew Walbran <qwandor@google.com> | 2023-10-19 16:02:44 +0100 |
| commit | 110cafaf3bf47891f748566991d66e78d9cc0f8c (patch) | |
| tree | dd35a6941b4bffa33e7aa6a31c19f1fb2e0b8325 | |
| parent | 061264f9e2d93f86d25f1acc4b5fced9612e39e6 (diff) | |
| download | arbitrary-110cafaf3bf47891f748566991d66e78d9cc0f8c.tar.gz | |
Migrate to cargo_embargo.
Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp.
Change-Id: Ida161984f87902bbf01830be34e026f6cff40e04
| -rw-r--r-- | Android.bp | 12 | ||||
| -rw-r--r-- | cargo2android.json | 12 | ||||
| -rw-r--r-- | cargo_embargo.json | 15 |
3 files changed, 19 insertions, 20 deletions
@@ -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 + } + } +} |