diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-06-09 23:46:57 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-06-09 23:46:57 -0700 |
| commit | ebb3a5e26f19355bbaa00d7da9b993a418c915f9 (patch) | |
| tree | 040f539a3d40b2b98ad54dcb4b31012d3ad6d2b1 | |
| parent | fd80703db718f98bbbcba05be50967c78d7be443 (diff) | |
| download | android_art-ebb3a5e26f19355bbaa00d7da9b993a418c915f9.tar.gz android_art-ebb3a5e26f19355bbaa00d7da9b993a418c915f9.tar.bz2 android_art-ebb3a5e26f19355bbaa00d7da9b993a418c915f9.zip | |
art: Fix QCPERF workaround for ARM after Clang fixes
* Use LOCAL_CLANG_arm instead of a target check.
Change-Id: I936c495acdb72b27f96b6aa9bb80c4cc84becfd7
| -rw-r--r-- | compiler/Android.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/compiler/Android.mk b/compiler/Android.mk index 9c7864524d..602aa67edc 100644 --- a/compiler/Android.mk +++ b/compiler/Android.mk @@ -269,10 +269,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) - ifeq ($(TARGET_ARCH),arm) - # FIXME! Current PERF is built with GCC and needs emutls - LOCAL_CLANG := false - endif + # FIXME! Current PERF is built with GCC and needs emutls + LOCAL_CLANG_arm := false LOCAL_WHOLE_STATIC_LIBRARIES_arm += libqc-art-compiler endif include $(BUILD_SHARED_LIBRARY) |