commit a47a6e89407fa9f0234d44c2be8451f4838c0780
author Andreas Gampe <agampe@google.com> Wed Jul 24 09:46:16 2019 -0700
committer Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 25 16:56:41 2019 +0000
tree 8977c4976486381c4f63aa602a98fac611898a95
parent a0fc13a97a22604c5587a30d3b92cf22e68079a7

ART: Extend bionic TLS use to host bionic

Use __BIONIC__ instead of ART_TARGET_ANDROID for bionic TLS usage.

Bug: 138329277
Test: m test-art-host
Test: art/test/testrunner/run_build_test_target.py art-linux-bionic-x64
Change-Id: I7dc605c6700323303d9c9503d3aecc4fddef8d45

build/Android.bp

diff --git a/build/Android.bp b/build/Android.bp
index dd17a7c..9fec80c 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -132,6 +132,13 @@
                 "-Wmissing-noreturn",
             ],
         },
+        linux_bionic: {
+            header_libs: [
+                // We optimize Thread::Current() with a direct TLS access. This requires access to a
+                //  private Bionic header.
+                "bionic_libc_private_headers",
+            ],
+        },
         darwin: {
             enabled: false,
         },