diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-11-01 04:36:08 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-11-01 04:37:54 -0800 |
| commit | 36dc4cef3347f8a6bae7cbeda1c77e636e16fab1 (patch) | |
| tree | badeca056e035027ca3a26480345cf272e05a7e1 | |
| parent | 2e5131ce0db9a11be1406d4e6b5a27993a0d1bd5 (diff) | |
| download | art-36dc4cef3347f8a6bae7cbeda1c77e636e16fab1.zip art-36dc4cef3347f8a6bae7cbeda1c77e636e16fab1.tar.gz art-36dc4cef3347f8a6bae7cbeda1c77e636e16fab1.tar.bz2 | |
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
| -rw-r--r-- | compiler/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
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) |