commit 7c32d2c58abb503ca74d9dcae1696c6efcaf0291
author Teemu Hukkanen <teemu@fairphone.com> Tue Feb 07 18:02:17 2017 +0100
committer Maarten Derks <maarten@fairphone.com> Mon May 29 15:46:34 2017 +0000
tree 2f1d3b925abc79d0934225ae1ed9302cfd4b1b57
parent 7e6572b4f69ac2915b00def17880da736b2a7326

Wrap qc-art around FP2_USE_PREBUILT_LIBART

FPIIM-921

Change-Id: I28b9a959d3932b0e9ef8021fb927e23bca8e57b7

compiler/Android.mk

diff --git a/compiler/Android.mk b/compiler/Android.mk
index 01f6f0b..071ddb0 100644
--- a/compiler/Android.mk
+++ b/compiler/Android.mk
@@ -264,7 +264,9 @@
     # For atrace.
     LOCAL_SHARED_LIBRARIES += libcutils
     ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
-      LOCAL_WHOLE_STATIC_LIBRARIES_arm += libqc-art-compiler
+      ifeq ($(FP2_USE_PREBUILT_LIBART),true)
+        LOCAL_WHOLE_STATIC_LIBRARIES_arm += 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 9f40ada..168f94e 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -476,7 +476,9 @@
     # For liblog, atrace, properties, ashmem, set_sched_policy and socket_peer_is_trusted.
     LOCAL_SHARED_LIBRARIES += libcutils
     ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
-      LOCAL_WHOLE_STATIC_LIBRARIES += libqc-art
+      ifeq ($(FP2_USE_PREBUILT_LIBART),true)
+        LOCAL_WHOLE_STATIC_LIBRARIES += libqc-art
+      endif
     endif
   else # host
     LOCAL_SHARED_LIBRARIES += libziparchive-host