summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--compiler/Android.mk2
-rw-r--r--runtime/Android.mk4
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/Android.mk b/compiler/Android.mk
index f6740c7..ae15ec2 100644
--- a/compiler/Android.mk
+++ b/compiler/Android.mk
@@ -263,7 +263,7 @@ $$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : $(LOCAL_PAT
ifeq ($$(art_target_or_host),target)
# For atrace.
LOCAL_SHARED_LIBRARIES += libcutils
- ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
+ ifeq ($(TARGET_HAVE_QC_PERF),true)
LOCAL_WHOLE_STATIC_LIBRARIES += libqc-art-compiler
endif
include $(BUILD_SHARED_LIBRARY)
diff --git a/runtime/Android.mk b/runtime/Android.mk
index e0afd3e..8c58b19 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -475,8 +475,8 @@ $$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : $(LOCAL_PAT
LOCAL_SHARED_LIBRARIES += libutils
# 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 ($(TARGET_HAVE_QC_PERF),true)
+ LOCAL_WHOLE_STATIC_LIBRARIES += libqc-art
endif
else # host
LOCAL_SHARED_LIBRARIES += libziparchive-host