Snap for 8188146 from e4d5121d4edbc7fa423ec76f0b91247fc2d531fb to tm-frc-documentsui-release

Change-Id: I87648067ebebb91cadbdae9f371adea0044ee6fb

3 files changed, 10 insertions, 11 deletions

diff --git a/Android.bp b/Android.bp
index f56a6fd..0ce190f 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 --host-first-multilib.
 
 package {
     default_applicable_licenses: ["external_rust_crates_no-panic_license"],
@@ -40,8 +39,6 @@ license {
 rust_proc_macro {
     name: "libno_panic",
     crate_name: "no_panic",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.1.15",
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
@@ -51,3 +48,9 @@ rust_proc_macro {
     ],
     compile_multilib: "first",
 }
+
+// dependent_library ["feature_list"]
+//   proc-macro2-1.0.24 "default,proc-macro"
+//   quote-1.0.8 "default,proc-macro"
+//   syn-1.0.60 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote"
+//   unicode-xid-0.2.1 "default"
diff --git a/TEST_MAPPING b/TEST_MAPPING
index d863df5..20d68b6 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,8 +1,8 @@
-// Generated by update_crate_tests.py for tests that depend on this crate.
+// Generated by cargo2android.py for tests that depend on this crate.
 {
-  "imports": [
+  "presubmit": [
     {
-      "path": "external/rust/crates/libm"
+      "name": "libm_device_test_src_lib"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index bb77633..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "host-first-multilib": true,
-  "run": true
-}
\ No newline at end of file