Snap for 8347268 from fe3ac0341f43fcf283c8c5697dc86f675ef7fc62 to mainline-go-extservices-release

Change-Id: I21ebd138b9affbb6cdf0e1756be66f705c0fba16

3 files changed, 17 insertions, 24 deletions

diff --git a/Android.bp b/Android.bp
index bc895d5..49e8234 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo2android.py --run --device --dependencies.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -41,8 +41,6 @@ rust_library {
     name: "libcsv",
     host_supported: true,
     crate_name: "csv",
-    cargo_env_compat: true,
-    cargo_pkg_version: "1.1.6",
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
@@ -53,3 +51,19 @@ rust_library {
         "libserde",
     ],
 }
+
+// dependent_library ["feature_list"]
+//   bstr-0.2.15 "default,lazy_static,regex-automata,serde,serde1,serde1-nostd,std,unicode"
+//   byteorder-1.4.3
+//   csv-core-0.1.10 "default"
+//   itoa-0.4.7 "default,std"
+//   lazy_static-1.4.0
+//   memchr-2.3.4 "std,use_std"
+//   proc-macro2-1.0.26 "default,proc-macro"
+//   quote-1.0.9 "default,proc-macro"
+//   regex-automata-0.1.9
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   syn-1.0.68 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
+//   unicode-xid-0.2.1 "default"
diff --git a/TEST_MAPPING b/TEST_MAPPING
deleted file mode 100644
index 3cbd48d..0000000
--- a/TEST_MAPPING
+++ /dev/null
@@ -1,17 +0,0 @@
-// 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
deleted file mode 100644
index bf78496..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "device": true,
-  "run": true
-}
\ No newline at end of file