diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 15:28:00 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-12-15 15:28:00 +0000 |
commit | 22b0736188f3e445f7c832ae91f4f54aac98275c (patch) | |
tree | c76731f80d33effafa20d23f668be11b34d66da2 | |
parent | fff6d9d2b311cec57139e4f5b6a2e1292e7e3f4e (diff) | |
parent | 1fef06453ab9e361e199cd662c74de6987da6996 (diff) | |
download | lazycell-22b0736188f3e445f7c832ae91f4f54aac98275c.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
-rw-r--r-- | Android.bp | 23 | ||||
-rw-r--r-- | TEST_MAPPING | 16 | ||||
-rw-r--r-- | cargo2android.json | 5 |
3 files changed, 25 insertions, 19 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --dependencies --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 { @@ -37,29 +37,20 @@ license { ], } -rust_defaults { - name: "lazycell_test_defaults", - crate_name: "lazycell", +rust_test { + name: "lazycell_test_src_lib", // has rustc warnings - srcs: ["src/lib.rs"], + host_supported: true, + crate_name: "lazycell", cargo_env_compat: true, cargo_pkg_version: "1.3.0", + srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, - edition: "2015", -} - -rust_test_host { - name: "lazycell_host_test_src_lib", - defaults: ["lazycell_test_defaults"], test_options: { unit_test: true, }, -} - -rust_test { - name: "lazycell_device_test_src_lib", - defaults: ["lazycell_test_defaults"], + edition: "2015", } rust_library { diff --git a/TEST_MAPPING b/TEST_MAPPING index e548a18..ff34c26 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,20 +1,30 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { + "imports": [ + { + "path": "external/rust/crates/libsqlite3-sys" + } + ], "presubmit": [ { "name": "keystore2_test" }, { - "name": "lazycell_device_test_src_lib" + "name": "lazycell_test_src_lib" }, { "name": "legacykeystore_test" + } + ], + "presubmit-rust": [ + { + "name": "keystore2_test" }, { - "name": "libsqlite3-sys_device_test_src_lib" + "name": "lazycell_test_src_lib" }, { - "name": "libsqlite3_bindgen_test" + "name": "legacykeystore_test" } ] } 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 |