diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:02:40 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:02:40 +0000 |
commit | a6c9e9aef6465a1f8df4e5bbb2cdd362f8c789fb (patch) | |
tree | e091c9a97d6073bb88e2a8cf89de7e13be8137df | |
parent | c994c7edfc18b4aafb0a2261c0f00775ecbd00f3 (diff) | |
parent | 935e163a3fc9f9372e11b80d67d46487dda8710a (diff) | |
download | walkdir-a6c9e9aef6465a1f8df4e5bbb2cdd362f8c789fb.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 935e163a3f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/walkdir/+/1912799
Change-Id: I14f93746f44585d8bace0958e516d441e8a3a41f
-rw-r--r-- | Android.bp | 7 | ||||
-rw-r--r-- | TEST_MAPPING | 12 | ||||
-rw-r--r-- | cargo2android.json | 4 |
3 files changed, 13 insertions, 10 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 { @@ -41,12 +41,11 @@ rust_library { name: "libwalkdir", host_supported: true, crate_name: "walkdir", + cargo_env_compat: true, + cargo_pkg_version: "2.3.2", srcs: ["src/lib.rs"], edition: "2018", rustlibs: [ "libsame_file", ], } - -// dependent_library ["feature_list"] -// same-file-1.0.6 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 |