Snap for 8347268 from edab50513c32a57737c2fdf60ab69b06867e6e06 to mainline-go-media-release

Change-Id: I7f9409ba85e42095eba41544527e035c110f61ef

3 files changed, 7 insertions, 38 deletions

diff --git a/Android.bp b/Android.bp
index fe3e3a5..9ad1f08 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
-// Do not modify this file as changes will be overridden on upgrade.
+// This file is generated by cargo2android.py --run --dependencies.
 
 package {
     default_applicable_licenses: ["external_rust_crates_remain_license"],
@@ -40,8 +39,6 @@ license {
 rust_proc_macro {
     name: "libremain",
     crate_name: "remain",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.2.2",
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
@@ -50,3 +47,9 @@ rust_proc_macro {
         "libsyn",
     ],
 }
+
+// dependent_library ["feature_list"]
+//   proc-macro2-1.0.18 "default,proc-macro"
+//   quote-1.0.7 "default,proc-macro"
+//   syn-1.0.33 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit,visit-mut"
+//   unicode-xid-0.2.1 "default"
diff --git a/TEST_MAPPING b/TEST_MAPPING
deleted file mode 100644
index 129fb3b..0000000
--- a/TEST_MAPPING
+++ /dev/null
@@ -1,31 +0,0 @@
-// Generated by update_crate_tests.py for tests that depend on this crate.
-{
-  "presubmit": [
-    {
-      "name": "ZipFuseTest"
-    },
-    {
-      "name": "apkdmverity.test"
-    },
-    {
-      "name": "authfs_device_test_src_lib"
-    },
-    {
-      "name": "virtualizationservice_device_test"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "ZipFuseTest"
-    },
-    {
-      "name": "apkdmverity.test"
-    },
-    {
-      "name": "authfs_device_test_src_lib"
-    },
-    {
-      "name": "virtualizationservice_device_test"
-    }
-  ]
-}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 958632b..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "run": true
-}
\ No newline at end of file