Snap for 8564071 from 4f50bc71e11b9f30ef04836acf29c90010ea22c6 to mainline-sdkext-releaseaml_sdk_331812000aml_sdk_331811100aml_sdk_331811000aml_sdk_331412000aml_sdk_331410000aml_sdk_331310010aml_sdk_331111000aml_sdk_330810050aml_sdk_330810010android13-mainline-sdkext-release

Change-Id: I710b8043327d035ea2bdf04d94cf4670990864c7

3 files changed, 24 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index bfb489b..39b0d16 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 {
@@ -42,6 +42,8 @@ rust_library {
     name: "libcsv_core",
     host_supported: true,
     crate_name: "csv_core",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.1.10",
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: ["default"],
@@ -49,6 +51,3 @@ rust_library {
         "libmemchr",
     ],
 }
-
-// dependent_library ["feature_list"]
-//   memchr-2.3.4
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..3cbd48d
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,17 @@
+// Generated by update_crate_tests.py for tests that depend on this crate.
+{
+  "imports": [
+    {
+      "path": "external/rust/crates/base64"
+    },
+    {
+      "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