diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 18:07:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 18:07:01 +0000 |
commit | 0b9ee10917e5465f7a217f0bf5b44909b160a299 (patch) | |
tree | e85631ff712359653621edf9e70654f8168f0e9c | |
parent | b23bb64845ffe5561313e7225205bb7741c3049f (diff) | |
parent | 534684ed5ce87a0d507dc04171031e0dbe9795db (diff) | |
download | glob-0b9ee10917e5465f7a217f0bf5b44909b160a299.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 6ec2da13f2 am: fc52419329 am: 2d57c7993c am: 534684ed5c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/glob/+/1912191
Change-Id: I14c694777140bfd225a20f63e7d94f94036d93c7
-rw-r--r-- | Android.bp | 5 | ||||
-rw-r--r-- | TEST_MAPPING | 13 | ||||
-rw-r--r-- | cargo2android.json | 4 |
3 files changed, 18 insertions, 4 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --run --dependencies --device. +// This file is generated by cargo2android.py --config cargo2android.json. +// Do not modify this file as changes will be overridden on upgrade. package { default_applicable_licenses: ["external_rust_crates_glob_license"], @@ -41,6 +42,8 @@ rust_library { // has rustc warnings host_supported: true, crate_name: "glob", + cargo_env_compat: true, + cargo_pkg_version: "0.3.0", srcs: ["src/lib.rs"], edition: "2015", } 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..bf78496 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,4 @@ +{ + "device": true, + "run": true +}
\ No newline at end of file |