summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Mertz <scott@cyngn.com>2015-11-03 18:58:19 -0800
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-02-25 15:25:40 -0800
commitbc971687ce82f7376948bf7d2a9a58db47b936e2 (patch)
treee1103719c84382e43680a089496f12928cbd6eaa
parentfdbc58301fef858cb7f8db682729f1b8d8d5f97f (diff)
downloadandroid_art-bc971687ce82f7376948bf7d2a9a58db47b936e2.tar.gz
android_art-bc971687ce82f7376948bf7d2a9a58db47b936e2.tar.bz2
android_art-bc971687ce82f7376948bf7d2a9a58db47b936e2.zip
ART: make ART extension available only in 32bit for msm8996
Original: https://www.codeaurora.org/cgit/quic/la/platform/art/commit/?h=LA.AF.1.1.1&id=ac245aa125188026590ac0092c212dd5cff11e5b Change-Id: Ic5ac941f5427a1d6340635fdd81308dc639f3fc8
-rw-r--r--compiler/Android.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/compiler/Android.mk b/compiler/Android.mk
index 1ed0490db1..0ce9a1773b 100644
--- a/compiler/Android.mk
+++ b/compiler/Android.mk
@@ -271,7 +271,11 @@ $$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : $(LOCAL_PAT
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
+ ifeq ($(TARGET_BOARD_PLATFORM),msm8996)
+ LOCAL_WHOLE_STATIC_LIBRARIES_arm += libqc-art-compiler
+ else
+ LOCAL_WHOLE_STATIC_LIBRARIES += libqc-art-compiler
+ endif
endif
include $(BUILD_SHARED_LIBRARY)
else # host