diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 17:27:10 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 17:27:10 +0000 |
commit | 164e0ee4fe5c06d7d7ccbb215ab4f546ade168ad (patch) | |
tree | 4c7c7f58fc7141686b0c8665aea7c9129ed9fab7 | |
parent | 20b940c95595cc454f3dad607314ff07db2d1ce1 (diff) | |
parent | a4065fbf6e21ad922f1e58d0e1fe331468105a76 (diff) | |
download | same-file-164e0ee4fe5c06d7d7ccbb215ab4f546ade168ad.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 68656c9e02 am: fe9f485e1f am: a4065fbf6e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/same-file/+/1912685
Change-Id: I88ab2fd9ec9b958d855a8434f38d013831c83700
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | TEST_MAPPING | 12 | ||||
-rw-r--r-- | cargo2android.json | 4 |
3 files changed, 13 insertions, 7 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -42,6 +42,8 @@ rust_library { name: "libsame_file", host_supported: true, crate_name: "same_file", + cargo_env_compat: true, + cargo_pkg_version: "1.0.6", srcs: ["src/lib.rs"], edition: "2018", } diff --git a/TEST_MAPPING b/TEST_MAPPING index 05c6d70..87ecd5c 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,20 +1,20 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ + "imports": [ { - "name": "base64_device_test_tests_decode" + "path": "external/rust/crates/base64" }, { - "name": "base64_device_test_tests_encode" + "path": "external/rust/crates/bitflags" }, { - "name": "base64_device_test_tests_helpers" + "path": "external/rust/crates/tinytemplate" }, { - "name": "unicode-xid_device_test_src_lib" + "path": "external/rust/crates/tinyvec" }, { - "name": "unicode-xid_device_test_tests_exhaustive_tests" + "path": "external/rust/crates/unicode-xid" } ] } 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 |