From 53b1f934963e65d6830b7ed3fda71c743fe56ce8 Mon Sep 17 00:00:00 2001
From: Joel Galenson <jgalenson@google.com>
Date: Mon, 29 Nov 2021 14:05:37 -0800
Subject: Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Test: None
Change-Id: I1572b9b1633d5ded443526b3d1652904a7c10913
---
 Android.bp         | 30 +++++++++++-------------------
 TEST_MAPPING       |  7 ++++++-
 cargo2android.json |  5 +++++
 3 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 cargo2android.json

diff --git a/Android.bp b/Android.bp
index cd66abf..a061761 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies --tests.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -41,6 +41,8 @@ rust_library {
     name: "libthread_local",
     host_supported: true,
     crate_name: "thread_local",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.1.3",
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
@@ -48,30 +50,20 @@ rust_library {
     ],
 }
 
-rust_defaults {
-    name: "thread_local_defaults",
+rust_test {
+    name: "thread_local_test_src_lib",
+    host_supported: true,
     crate_name: "thread_local",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.1.3",
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     rustlibs: [
         "libonce_cell",
     ],
 }
-
-rust_test_host {
-    name: "thread_local_host_test_src_lib",
-    defaults: ["thread_local_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "thread_local_device_test_src_lib",
-    defaults: ["thread_local_defaults"],
-}
-
-// dependent_library ["feature_list"]
-//   once_cell-1.7.2 "alloc,default,race,std"
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 478894e..7974396 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,7 +2,12 @@
 {
   "presubmit": [
     {
-      "name": "thread_local_device_test_src_lib"
+      "name": "thread_local_test_src_lib"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "thread_local_test_src_lib"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..d36fb44
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,5 @@
+{
+  "device": true,
+  "run": true,
+  "tests": true
+}
\ No newline at end of file
-- 
cgit v1.2.3