Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged

Bug: 166295507
Merged-In: I2f1204cc8a4aca48eaef99ef17768a9dfa3b79ee
Change-Id: I6796bf1222a99cedb2f7f6f03b8834cbad118d3e
diff --git a/Android.bp b/Android.bp
index b8fe6c6..e042ea0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --dependencies.
+// This file is generated by cargo2android.py --run --dependencies --tests.
 
 rust_library_host {
     name: "libthread_local",
@@ -10,5 +10,17 @@
     ],
 }
 
+rust_test_host {
+    name: "thread_local_host_test_src_lib",
+    crate_name: "thread_local",
+    srcs: ["src/lib.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2015",
+    rustlibs: [
+        "liblazy_static",
+    ],
+}
+
 // dependent_library ["feature_list"]
 //   lazy_static-1.4.0
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..ef632cf
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,9 @@
+// Generated by cargo2android.py for tests in Android.bp
+{
+  "presubmit": [
+    {
+      "name": "thread_local_host_test_src_lib",
+      "host": true
+    }
+  ]
+}