Snap for 8347268 from 173949d17a33d0683a63e0b521817c428a670a34 to mainline-go-media-release

Change-Id: I991750322849d4779706a887c6ef87f0236691b5

2 files changed, 21 insertions, 9 deletions

diff --git a/Android.bp b/Android.bp
index 19ee49c..d61aadd 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 --tests --dependencies --host-first-multilib.
 
 package {
     default_applicable_licenses: ["external_rust_crates_syn-mid_license"],
@@ -40,8 +39,6 @@ license {
 rust_library_host {
     name: "libsyn_mid",
     crate_name: "syn_mid",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.5.3",
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
@@ -51,3 +48,23 @@ rust_library_host {
     ],
     compile_multilib: "first",
 }
+
+rust_test_host {
+    name: "syn-mid_host_test_src_lib",
+    crate_name: "syn_mid",
+    srcs: ["src/lib.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2018",
+    rustlibs: [
+        "libproc_macro2",
+        "libquote",
+        "libsyn",
+    ],
+}
+
+// dependent_library ["feature_list"]
+//   proc-macro2-1.0.24
+//   quote-1.0.8
+//   syn-1.0.58 "derive,parsing,printing,quote"
+//   unicode-xid-0.2.1 "default"
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index b360f74..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "host-first-multilib": true,
-  "run": true,
-  "tests": true
-}
\ No newline at end of file