Snap for 8358640 from 73c886f3020b89421c1bdd9d22ba98b4b0d4f194 to mainline-go-extservices-release

Change-Id: I0caffceecd60cffe2727c8fa6a6a9a7bb7eeafc9
diff --git a/Android.bp b/Android.bp
index c060544..46f036e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --dependencies.
+// This file is generated by cargo2android.py --config cargo2android.json.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     default_applicable_licenses: [
@@ -41,6 +42,8 @@
 rust_proc_macro {
     name: "libproc_macro_hack",
     crate_name: "proc_macro_hack",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.5.19",
     srcs: ["src/lib.rs"],
     edition: "2018",
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
deleted file mode 100644
index b518f2a..0000000
--- a/TEST_MAPPING
+++ /dev/null
@@ -1,8 +0,0 @@
-// Generated by cargo2android.py for tests in Android.bp
-{
-  "presubmit": [
-    {
-      "name": "futures-util_device_test_src_lib"
-    }
-  ]
-}
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..958632b
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,3 @@
+{
+  "run": true
+}
\ No newline at end of file