diff options
author | Andrew Walbran <qwandor@google.com> | 2023-11-15 21:04:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-15 21:04:21 +0000 |
commit | 77ba77e9d141989031d94d163c5098014cd80012 (patch) | |
tree | 7dcdef8f8f4d060bc3fa782f07292bd99e4e9255 | |
parent | b67ce2a38ab94043703a7cd075232360667c8875 (diff) | |
parent | 0d11f1ac04d51969ebef04354581cfa54d8ac98c (diff) | |
download | serde_cbor-77ba77e9d141989031d94d163c5098014cd80012.tar.gz |
Migrate to cargo_embargo. am: 8ac924bc6b am: 0d11f1ac04
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_cbor/+/2832892
Change-Id: I5cdaa5f7434ed4947e00cbac4a99e97de7cf3a9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 149 | ||||
-rw-r--r-- | cargo2android.json | 7 | ||||
-rw-r--r-- | cargo_embargo.json | 7 |
3 files changed, 135 insertions, 28 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 { @@ -62,13 +62,18 @@ rust_library { vendor_available: true, } -rust_defaults { - name: "serde_cbor_test_defaults", - crate_name: "serde_cbor", +rust_test { + name: "serde_cbor_test_tests_bennofs", + host_supported: true, + crate_name: "bennofs", cargo_env_compat: true, cargo_pkg_version: "0.11.2", + srcs: ["tests/bennofs.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: [ "default", @@ -84,81 +89,183 @@ rust_defaults { } rust_test { - name: "serde_cbor_test_tests_bennofs", - defaults: ["serde_cbor_test_defaults"], - host_supported: true, - srcs: ["tests/bennofs.rs"], - test_options: { - unit_test: true, - }, -} - -rust_test { name: "serde_cbor_test_tests_canonical", - defaults: ["serde_cbor_test_defaults"], host_supported: true, + crate_name: "canonical", + cargo_env_compat: true, + cargo_pkg_version: "0.11.2", srcs: ["tests/canonical.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2018", + features: [ + "default", + "std", + "tags", + ], + rustlibs: [ + "libhalf", + "libserde", + "libserde_cbor", + ], + proc_macros: ["libserde_derive"], } rust_test { name: "serde_cbor_test_tests_de", - defaults: ["serde_cbor_test_defaults"], host_supported: true, + crate_name: "de", + cargo_env_compat: true, + cargo_pkg_version: "0.11.2", srcs: ["tests/de.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2018", + features: [ + "default", + "std", + "tags", + ], + rustlibs: [ + "libhalf", + "libserde", + "libserde_cbor", + ], + proc_macros: ["libserde_derive"], } rust_test { name: "serde_cbor_test_tests_enum", - defaults: ["serde_cbor_test_defaults"], host_supported: true, + crate_name: "enum", + cargo_env_compat: true, + cargo_pkg_version: "0.11.2", srcs: ["tests/enum.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2018", + features: [ + "default", + "std", + "tags", + ], + rustlibs: [ + "libhalf", + "libserde", + "libserde_cbor", + ], + proc_macros: ["libserde_derive"], } rust_test { name: "serde_cbor_test_tests_ser", - defaults: ["serde_cbor_test_defaults"], host_supported: true, + crate_name: "ser", + cargo_env_compat: true, + cargo_pkg_version: "0.11.2", srcs: ["tests/ser.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2018", + features: [ + "default", + "std", + "tags", + ], + rustlibs: [ + "libhalf", + "libserde", + "libserde_cbor", + ], + proc_macros: ["libserde_derive"], } rust_test { name: "serde_cbor_test_tests_std_types", - defaults: ["serde_cbor_test_defaults"], host_supported: true, + crate_name: "std_types", + cargo_env_compat: true, + cargo_pkg_version: "0.11.2", srcs: ["tests/std_types.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2018", + features: [ + "default", + "std", + "tags", + ], + rustlibs: [ + "libhalf", + "libserde", + "libserde_cbor", + ], + proc_macros: ["libserde_derive"], } rust_test { name: "serde_cbor_test_tests_tags", - defaults: ["serde_cbor_test_defaults"], host_supported: true, + crate_name: "tags", + cargo_env_compat: true, + cargo_pkg_version: "0.11.2", srcs: ["tests/tags.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2018", + features: [ + "default", + "std", + "tags", + ], + rustlibs: [ + "libhalf", + "libserde", + "libserde_cbor", + ], + proc_macros: ["libserde_derive"], } rust_test { name: "serde_cbor_test_tests_value", - defaults: ["serde_cbor_test_defaults"], host_supported: true, + crate_name: "value", + cargo_env_compat: true, + cargo_pkg_version: "0.11.2", srcs: ["tests/value.rs"], + test_suites: ["general-tests"], + auto_gen_config: true, test_options: { unit_test: true, }, + edition: "2018", + features: [ + "default", + "std", + "tags", + ], + rustlibs: [ + "libhalf", + "libserde", + "libserde_cbor", + ], + proc_macros: ["libserde_derive"], } diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 604d595..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "device": true, - "features": "default,tags", - "run": true, - "tests": true, - "vendor-available": true -}
\ No newline at end of file diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..abdd3d0 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,7 @@ +{ + "features": [ + "default", + "tags" + ], + "tests": true +} |