commit 4d4cef86f56f034acef8790572c173bc7db91eb1
author Dmitriy Ivanov <dimitry@google.com> Thu Mar 26 11:56:18 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Thu Mar 26 11:56:18 2015 -0700
tree 1790d384b66220a80f50e38d139c49ce587ad65d
parent 52c3f9142775b0feb6a571d43d42d657242d3b22

Support thread_local keyword for target builds.

Bug: 19800080
Bug: 16696563
Change-Id: Ib0917658883a19dcdeff2ae32b89502653c00879

Android.mk

diff --git a/Android.mk b/Android.mk
index 3545195..e2625d6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -27,6 +27,7 @@
     src/cxa_handlers.cpp \
     src/cxa_new_delete.cpp \
     src/cxa_personality.cpp \
+    src/cxa_thread_atexit.cpp \
     src/cxa_unexpected.cpp \
     src/cxa_vector.cpp \
     src/cxa_virtual.cpp \
@@ -75,7 +76,7 @@
 LOCAL_CLANG := true
 LOCAL_SRC_FILES := $(LIBCXXABI_SRC_FILES)
 LOCAL_C_INCLUDES := $(LIBCXXABI_INCLUDES)
-LOCAL_CPPFLAGS := $(LIBCXXABI_CPPFLAGS)
+LOCAL_CPPFLAGS := $(LIBCXXABI_CPPFLAGS) -DHAVE___CXA_THREAD_ATEXIT_IMPL
 LOCAL_CPPFLAGS_arm := -DLIBCXXABI_USE_LLVM_UNWINDER=1
 LOCAL_CPPFLAGS_arm64 := -DLIBCXXABI_USE_LLVM_UNWINDER=0
 LOCAL_CPPFLAGS_mips := -DLIBCXXABI_USE_LLVM_UNWINDER=0