Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1

3 files changed, 13 insertions, 10 deletions

diff --git a/Android.bp b/Android.bp
index 9ea5995..9b0078c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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