diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:12 +0000 |
commit | 5b52687416f1c1af588f4e87e56589b52e439ba3 (patch) | |
tree | 8c1f10581a44c917d892b0388d1161f05d897c26 | |
parent | 3d2cd2463b0ca479cfa3b2485105c8b6a2a79ca4 (diff) | |
parent | e6e83d2b58071f7a106a09be8dea078e62f03c44 (diff) | |
download | shlex-5b52687416f1c1af588f4e87e56589b52e439ba3.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 1ed8fff4d4 am: e6e83d2b58
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/shlex/+/1912815
Change-Id: I5c508bdd99872fa3925be3467c8dd40eaf152160
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | TEST_MAPPING | 13 | ||||
-rw-r--r-- | cargo2android.json | 4 |
3 files changed, 16 insertions, 5 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --tests. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -52,7 +52,7 @@ rust_library_host { } rust_test_host { - name: "shlex_host_test_src_lib", + name: "shlex_test_src_lib", crate_name: "shlex", cargo_env_compat: true, cargo_pkg_version: "1.1.0", diff --git a/TEST_MAPPING b/TEST_MAPPING index d87563d..e4ec3b3 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,17 +1,24 @@ // 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": "legacykeystore_test" - }, + } + ], + "presubmit-rust": [ { - "name": "libsqlite3-sys_device_test_src_lib" + "name": "keystore2_test" }, { - "name": "libsqlite3_bindgen_test" + "name": "legacykeystore_test" } ] } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..341300b --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,4 @@ +{ + "run": true, + "tests": true +}
\ No newline at end of file |