commit fd9ec1ca0febeb1e6947c2fb374d8de00fd81e6e
author Chih-hung Hsieh <chh@google.com> Tue Jan 05 00:20:51 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 05 00:20:51 2016 +0000
tree 09cbf69cec61018515c70da4f6b755c1d274ac21
parent db9bcffaa55e90b25ad60614bab3674814b15dcf
parent a6d897b9292b721cb30cc8334005c277f7201922

Merge "Enable clang, except arm64."
am: a6d897b929

* commit 'a6d897b9292b721cb30cc8334005c277f7201922':
  Enable clang, except arm64.

Android.mk

diff --git a/Android.mk b/Android.mk
index 14acca4..0ced5b7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -2,9 +2,9 @@
 
 include $(CLEAR_VARS)
 
-# Android clang does not support emulate TLS yet.
-# BUG: 25294261
-LOCAL_CLANG := false
+# Android clang has emulated TLS now but not working for arm64.
+# BUG: 25294261, 25642296
+LOCAL_CLANG_arm64 := false
 
 LOCAL_SRC_FILES := \
     libcap-ng-0.7/src/cap-ng.c \