From f167c5fc4cf8b8194bea284f8aff1d27a3e49d92 Mon Sep 17 00:00:00 2001
From: Jakub Kotur <qtr@google.com>
Date: Fri, 5 Feb 2021 15:31:07 +0100
Subject: Enable thread_local on the device.

This is requried by criterion.

Bug: 155309706
Change-Id: I235a8a9c8686fc954da225cf772b8c5dd5d4c6b0
---
 Android.bp   | 64 +++++++++++++++++++-----------------------------------------
 TEST_MAPPING |  7 ++++++-
 2 files changed, 26 insertions(+), 45 deletions(-)

diff --git a/Android.bp b/Android.bp
index 1ebe227..3c3c0b4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,43 +1,9 @@
-// This file is generated by cargo2android.py --run --dependencies --tests.
+// This file is generated by cargo2android.py --run --device --dependencies --tests.
+// Do not modify this file as changes will be overridden on upgrade.
 
-package {
-    default_applicable_licenses: ["external_rust_crates_thread_local_license"],
-}
-
-// Added automatically by a large-scale-change that took the approach of
-// 'apply every license found to every target'. While this makes sure we respect
-// every license restriction, it may not be entirely correct.
-//
-// e.g. GPL in an MIT project might only apply to the contrib/ directory.
-//
-// Please consider splitting the single license below into multiple licenses,
-// taking care not to lose any license_kind information, and overriding the
-// default license using the 'licenses: [...]' property on targets as needed.
-//
-// For unused files, consider creating a 'fileGroup' with "//visibility:private"
-// to attach the license to, and including a comment whether the files may be
-// used in the current project.
-//
-// large-scale-change included anything that looked like it might be a license
-// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
-//
-// Please consider removing redundant or irrelevant files from 'license_text:'.
-// See: http://go/android-license-faq
-license {
-    name: "external_rust_crates_thread_local_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-        "SPDX-license-identifier-MIT",
-    ],
-    license_text: [
-        "LICENSE-APACHE",
-        "LICENSE-MIT",
-    ],
-}
-
-rust_library_host {
+rust_library {
     name: "libthread_local",
+    host_supported: true,
     crate_name: "thread_local",
     srcs: ["src/lib.rs"],
     edition: "2018",
@@ -46,20 +12,30 @@ rust_library_host {
     ],
 }
 
-rust_test_host {
-    name: "thread_local_host_test_src_lib",
+rust_defaults {
+    name: "thread_local_defaults",
     crate_name: "thread_local",
     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.5.2 "alloc,default,std"
+//   once_cell-1.7.2 "alloc,default,race,std"
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 6551257..f53788f 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -4,9 +4,14 @@
     {
       "name": "keystore2_test"
     },
+    {
+      "name": "thread_local_device_test_src_lib"
+    },
     {
       "name": "libsqlite3-sys_device_test_src_lib"
+    },
+    {
+      "name": "vpnprofilestore_test"
     }
   ]
 }
-
-- 
cgit v1.2.3