From 46f4c89b4485c23b7a921b8a0c9ce6154e148972 Mon Sep 17 00:00:00 2001
From: Joel Galenson <jgalenson@google.com>
Date: Mon, 23 Aug 2021 09:53:36 -0700
Subject: Update TEST_MAPPING

Test: None
Change-Id: I93e480955e583dd06696b8c006c8641442ec7c47
---
 TEST_MAPPING | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 20d68b6..0584ced 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,4 +1,4 @@
-// Generated by cargo2android.py for tests that depend on this crate.
+// Generated by update_crate_tests.py for tests that depend on this crate.
 {
   "presubmit": [
     {
-- 
cgit v1.2.3


From 711fa6ae338f0e36fe229ef0573c362ecbb41768 Mon Sep 17 00:00:00 2001
From: Joel Galenson <jgalenson@google.com>
Date: Mon, 29 Nov 2021 14:04:26 -0800
Subject: Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Test: None
Change-Id: I6f2c637f77084aabd2e09f9f52d455da331f402c
---
 Android.bp         | 11 ++++-------
 TEST_MAPPING       |  4 ++--
 cargo2android.json |  4 ++++
 3 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 cargo2android.json

diff --git a/Android.bp b/Android.bp
index 0ce190f..f56a6fd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --dependencies --host-first-multilib.
+// 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: ["external_rust_crates_no-panic_license"],
@@ -39,6 +40,8 @@ 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: [
@@ -48,9 +51,3 @@ 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 0584ced..d863df5 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,8 +1,8 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
+  "imports": [
     {
-      "name": "libm_device_test_src_lib"
+      "path": "external/rust/crates/libm"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..bb77633
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,4 @@
+{
+  "host-first-multilib": true,
+  "run": true
+}
\ No newline at end of file
-- 
cgit v1.2.3