Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Test: None
Change-Id: I1572b9b1633d5ded443526b3d1652904a7c10913

1 files changed, 11 insertions, 19 deletions

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"