diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:14 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:14 +0000 |
commit | 1e37f231277cca7e656106ca3fd3bbd9f2c38bf6 (patch) | |
tree | e4e9d126386df7b58ad3bf0c7b6ad68537288b11 | |
parent | e18d688c4b67299d6b2f270f7a4a173a94393769 (diff) | |
parent | 5d63966955da171cf64472e28a76da191323b272 (diff) | |
download | cexpr-1e37f231277cca7e656106ca3fd3bbd9f2c38bf6.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: d713000e27 am: 5d63966955
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1912047
Change-Id: I236fdb6639523d041f63f46079b1f5f83a28d982
-rw-r--r-- | Android.bp | 14 | ||||
-rw-r--r-- | TEST_MAPPING | 13 | ||||
-rw-r--r-- | cargo2android.json | 4 |
3 files changed, 17 insertions, 14 deletions
@@ -1,4 +1,4 @@ -// 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 { @@ -41,19 +41,11 @@ rust_library { name: "libcexpr", host_supported: true, crate_name: "cexpr", + cargo_env_compat: true, + cargo_pkg_version: "0.5.0", srcs: ["src/lib.rs"], edition: "2018", rustlibs: [ "libnom", ], } - -// dependent_library ["feature_list"] -// bitvec-0.19.5 "alloc,std" -// funty-1.1.0 -// memchr-2.3.4 "std,use_std" -// nom-6.2.0 "alloc,bitvec,funty,std" -// radium-0.5.3 -// tap-1.0.1 -// version_check-0.9.3 -// wyz-0.2.0 "alloc" 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 |