Snap for 8006021 from 4f50bc71e11b9f30ef04836acf29c90010ea22c6 to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r9android-platform-13.0.0_r8android-platform-13.0.0_r7android-platform-13.0.0_r6android-platform-13.0.0_r5android-platform-13.0.0_r4android-platform-13.0.0_r3android-platform-13.0.0_r2android-platform-13.0.0_r19android-platform-13.0.0_r18android-platform-13.0.0_r17android-platform-13.0.0_r16android-platform-13.0.0_r15android-platform-13.0.0_r14android-platform-13.0.0_r13android-platform-13.0.0_r12android-platform-13.0.0_r11android-platform-13.0.0_r10android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseandroid13-platform-releaseandroid13-gsi

Change-Id: If47b92dd442e5d027f788cfc203daea1ae79e42c

3 files changed, 12 insertions, 12 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
index 05c6d70..3cbd48d 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,20 +1,17 @@
 // 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/tinytemplate"
     },
     {
-      "name": "base64_device_test_tests_helpers"
+      "path": "external/rust/crates/tinyvec"
     },
     {
-      "name": "unicode-xid_device_test_src_lib"
-    },
-    {
-      "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