From 36dc4cef3347f8a6bae7cbeda1c77e636e16fab1 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Sun, 1 Nov 2015 04:36:08 -0800 Subject: art: Build compiler with GCC if QC extension is used * QC hasn't switched to Clang yet, and the perf lib needs the emutls_v symbols generated from a newly-exposed threadlocal. Change-Id: I6c190c10c8878b2f5d36a36b6051a23e1dfae8e9 --- compiler/Android.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compiler/Android.mk b/compiler/Android.mk index ae15ec2..5dbcd07 100644 --- a/compiler/Android.mk +++ b/compiler/Android.mk @@ -264,6 +264,8 @@ $$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : $(LOCAL_PAT # For atrace. LOCAL_SHARED_LIBRARIES += libcutils ifeq ($(TARGET_HAVE_QC_PERF),true) + # FIXME! Current PERF is built with GCC and needs emutls + LOCAL_CLANG := false LOCAL_WHOLE_STATIC_LIBRARIES += libqc-art-compiler endif include $(BUILD_SHARED_LIBRARY) -- cgit v1.1