summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-06-05 05:10:42 -0700
committerSteve Kondik <steve@cyngn.com>2016-06-05 05:10:42 -0700
commit6aa5ad4a08e7ac8654cddc9a7af46b31a5eb2029 (patch)
tree772cc65e76537ad14ccee502632e6a3678aacb37
parent1c392f0b33a51e4206b328e05b9af82fea929046 (diff)
downloadart-6aa5ad4a08e7ac8654cddc9a7af46b31a5eb2029.tar.gz
art-6aa5ad4a08e7ac8654cddc9a7af46b31a5eb2029.tar.bz2
art-6aa5ad4a08e7ac8654cddc9a7af46b31a5eb2029.zip
art: Only force-disable Clang use on ARM32+QCPERF
Change-Id: Idf2db59d5d4c1b7b894afdb897b5815023964495
-rw-r--r--compiler/Android.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/compiler/Android.mk b/compiler/Android.mk
index 3d7db08f29..9c7864524d 100644
--- a/compiler/Android.mk
+++ b/compiler/Android.mk
@@ -269,8 +269,10 @@ $$(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
+ ifeq ($(TARGET_ARCH),arm)
+ # FIXME! Current PERF is built with GCC and needs emutls
+ LOCAL_CLANG := false
+ endif
LOCAL_WHOLE_STATIC_LIBRARIES_arm += libqc-art-compiler
endif
include $(BUILD_SHARED_LIBRARY)