summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorArkadiusz Hiler <arkadiusz.hiler@intel.com>2017-04-18 15:27:43 +0200
committerArkadiusz Hiler <arkadiusz.hiler@intel.com>2017-06-07 13:28:16 +0300
commitfcda874bfae0cd0319b13a2d90c7f4f8f979ab6c (patch)
tree38ed8f831653c8d3484741b3ee89accf35d3cec7 /tools
parent6047b01fc6faae5181c75c21e69117e71126064c (diff)
tools/Android.mk: Fix zlib inclusion
Add dependency on libz instead of doing path magic. Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> Reviewed-by: Petri Latvala <petri.latvala@intel.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/Android.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/Android.mk b/tools/Android.mk
index 56535720..96075c9d 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -29,9 +29,8 @@ define add_tool
LOCAL_LDFLAGS += $($(1)_LDFLAGS)
endif
- LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib
- LOCAL_C_INCLUDES += $(LOCAL_PATH)/../lib/stubs/drm/
- LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/zlib
+ LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib \
+ $(LOCAL_PATH)/../lib/stubs/drm/
LOCAL_MODULE := $1_tool
LOCAL_MODULE_TAGS := optional
@@ -41,7 +40,8 @@ define add_tool
LOCAL_SHARED_LIBRARIES := libpciaccess \
libkmod \
libdrm \
- libdrm_intel
+ libdrm_intel \
+ libz
# Tools dir on host
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/$(LOCAL_TOOLS_DIR)