diff options
| author | Steve Kondik <steve@cyngn.com> | 2014-11-08 06:14:18 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-10-12 13:17:54 -1000 |
| commit | ead3f39d3e80a90a1863e79822bf5acfae50e9ca (patch) | |
| tree | 42154f3f9a8beedc98d7b834912ae6c1ef908125 | |
| parent | 6e037f8660f40fd5869f7a48f27751caaaaa626d (diff) | |
| download | art-ead3f39d3e80a90a1863e79822bf5acfae50e9ca.zip art-ead3f39d3e80a90a1863e79822bf5acfae50e9ca.tar.gz art-ead3f39d3e80a90a1863e79822bf5acfae50e9ca.tar.bz2 | |
art: Update QC-PERF board flag to TARGET_HAVE_QC_PERF
* Some targets will set QCOM_HARDWARE but won't have these libs.
Change-Id: I84292c190c120b646f5017d4801e7893fed902ff
| -rw-r--r-- | compiler/Android.mk | 2 | ||||
| -rw-r--r-- | runtime/Android.mk | 4 |
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 |