LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Always use our copy of libz" am: d78df25e19

Browse Source 
am: f5dd447b3c

Change-Id: I7f89d4537ad3eb277196aa9899c046f178fd2d44
This commit is contained in:
Dan Willemsen
2017-09-27 00:04:22 +00:00
committed by android-build-merger
parent 8bd902e7b6 f5dd447b3c
commit 3c0e5ab47f
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/etc1tool/Android.mk
View File

@@ -12,13 +12,8 @@ LOCAL_SRC_FILES := etc1tool.cpp
LOCAL_STATIC_LIBRARIES := \
libexpat \
libpng \
libETC1
# Statically link libz for MinGW (Win SDK under Linux),
# and dynamically link for all others.
LOCAL_STATIC_LIBRARIES_windows := libz
LOCAL_LDLIBS_darwin := -lz
LOCAL_LDLIBS_linux := -lrt -lz
libETC1 \
libz
LOCAL_MODULE := etc1tool
LOCAL_MODULE_HOST_OS := darwin linux windows