commit 24f479987481b4c6f27fc85f6c8079fd76b7f655
author Teemu Hukkanen <teemu@fairphone.com> Tue Feb 07 18:02:17 2017 +0100
committer Teemu Hukkanen <teemu@fairphone.com> Tue Feb 07 18:02:17 2017 +0100
tree 8edeccddab27278049b0fafc85d1c3fcd74ce7e2
parent 4aa9ed1c19dd0bf2a129185aa04f97f72784502d

Wrap qc-art around FP2_USE_PREBUILT_LIBART

Change-Id: I28b9a959d3932b0e9ef8021fb927e23bca8e57b7

compiler/Android.mk

diff --git a/compiler/Android.mk b/compiler/Android.mk
index 7f79a52..1f23b66 100644
--- a/compiler/Android.mk
+++ b/compiler/Android.mk
@@ -262,7 +262,9 @@
   ifeq ($$(art_target_or_host),target)
     LOCAL_SHARED_LIBRARIES += libcutils libvixl
     ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
+      ifeq ($(FP2_USE_PREBUILT_LIBART),true)
       LOCAL_WHOLE_STATIC_LIBRARIES += libqc-art-compiler
+      endif
     endif
     include $(BUILD_SHARED_LIBRARY)
   else # host

runtime/Android.mk

diff --git a/runtime/Android.mk b/runtime/Android.mk
index 23bc79d..f017853 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -428,7 +428,9 @@
     LOCAL_SHARED_LIBRARIES += libcutils libdl libselinux libutils libsigchain
     LOCAL_STATIC_LIBRARIES := libziparchive libz
     ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
+      ifeq ($(FP2_USE_PREBUILT_LIBART),true)
 	  LOCAL_WHOLE_STATIC_LIBRARIES += libqc-art
+      endif
     endif
   else # host
     LOCAL_STATIC_LIBRARIES += libcutils libziparchive-host libz libutils