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
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