diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 18:07:17 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 18:07:17 +0000 |
commit | 4e3f0ef82bc57d51ddb57452188bcb8732b6c862 (patch) | |
tree | 703a8b50aeaf621a4902375656a005a4e861abd3 | |
parent | d42f7e6b70fc53c8caa052bb49f202291dbb9a2f (diff) | |
parent | c5bd497878641f18b5595cd65b31b13d60e40173 (diff) | |
download | serde_test-4e3f0ef82bc57d51ddb57452188bcb8732b6c862.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 0234237372 am: ac1d9888f5 am: c3024a4af7 am: c5bd497878
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_test/+/1912814
Change-Id: I5bd443eb2bc4b057241af00c0a1115ccd1e870d0
-rw-r--r-- | Android.bp | 30 | ||||
-rw-r--r-- | TEST_MAPPING | 13 | ||||
-rw-r--r-- | cargo2android.json | 5 |
3 files changed, 11 insertions, 37 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --tests. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -50,31 +50,3 @@ rust_library { "libserde", ], } - -rust_defaults { - name: "serde_test_test_defaults", - crate_name: "serde_test", - srcs: ["src/lib.rs"], - cargo_env_compat: true, - cargo_pkg_version: "1.0.130", - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2015", - rustlibs: [ - "libserde", - ], - proc_macros: ["libserde_derive"], -} - -rust_test_host { - name: "serde_test_host_test_src_lib", - defaults: ["serde_test_test_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "serde_test_device_test_src_lib", - defaults: ["serde_test_test_defaults"], -} diff --git a/TEST_MAPPING b/TEST_MAPPING index 7d52530..a2a8716 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,20 +1,17 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ + "imports": [ { - "name": "serde_test_device_test_src_lib" + "path": "external/rust/crates/bytes" }, { - "name": "slab_device_test_src_lib" + "path": "external/rust/crates/slab" }, { - "name": "slab_device_test_tests_serde" + "path": "external/rust/crates/tinyvec" }, { - "name": "slab_device_test_tests_slab" - }, - { - "name": "unicode-bidi_device_test_src_lib" + "path": "external/rust/crates/unicode-bidi" } ] } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..d36fb44 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,5 @@ +{ + "device": true, + "run": true, + "tests": true +}
\ No newline at end of file |