diff options
author | Andrew Walbran <qwandor@google.com> | 2023-10-20 13:17:59 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-20 13:17:59 +0000 |
commit | d36b1e0c6c0be6efe9f91649709fe8d0bdd44054 (patch) | |
tree | dd35a6941b4bffa33e7aa6a31c19f1fb2e0b8325 | |
parent | 7bb32c9a824d026ec5ab31bb3f0a62cb7e2074a8 (diff) | |
parent | 8924d2e271d7a2094e7103abacbe24d6eff08d05 (diff) | |
download | arbitrary-d36b1e0c6c0be6efe9f91649709fe8d0bdd44054.tar.gz |
Migrate to cargo_embargo. am: 110cafaf3b am: 56030e5370 am: 8924d2e271
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/arbitrary/+/2796493
Change-Id: I62606e765463012f9dc9f08ed6c2d2ba37f59ee6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-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 + } + } +} |