Snap for 8570526 from 170bb80e2afbfdbc7f4cbc15c699687262e762a0 to mainline-media-swcodec-releaseaml_swc_331911000aml_swc_331712000aml_swc_331612000aml_swc_331511000aml_swc_331410000aml_swc_331318000aml_swc_331116000aml_swc_331012020android13-mainline-media-swcodec-release

Change-Id: I96af4c375a074296e81fab3d77a2a07473d8fef5

3 files changed, 27 insertions, 4 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
new file mode 100644
index 0000000..87ecd5c
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,20 @@
+// Generated by update_crate_tests.py for tests that depend on this crate.
+{
+  "imports": [
+    {
+      "path": "external/rust/crates/base64"
+    },
+    {
+      "path": "external/rust/crates/bitflags"
+    },
+    {
+      "path": "external/rust/crates/tinytemplate"
+    },
+    {
+      "path": "external/rust/crates/tinyvec"
+    },
+    {
+      "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