diff options
| author | Narayan Kamath <narayan@google.com> | 2015-02-25 17:03:58 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-02-25 17:09:14 +0000 |
| commit | 4e7f18a26cbb842e7fda3e9bd9c1378a5a67e210 (patch) | |
| tree | d7b9275eb6ce8a54c9d4308b64f52d2ac03077ca | |
| parent | 2c5449771bc66dd1aa4f00ae9e36fca1134ac148 (diff) | |
| download | libpng-4e7f18a26cbb842e7fda3e9bd9c1378a5a67e210.tar.gz | |
Fix windows build.
Declare an explicit dependency on libz for its headers. This works
on non-windows builds because libz appears to be in the default
include path.
Also, remove a doubly obsolete hack. Obsolete because we don't compile
the platform on cygwin any longer and obsolete because we don't use
-fvisibility=hidden any longer.
Change-Id: I85e6fc8dda32a0479fcf241b2dde8679e6b6688d
| -rw-r--r-- | Android.mk | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/Android.mk b/Android.mk index d99ad9010..959b73c16 100644 --- a/Android.mk +++ b/Android.mk @@ -38,15 +38,6 @@ my_src_files_arm := \ common_CFLAGS := -std=gnu89 #-fvisibility=hidden ## -fomit-frame-pointer -ifeq ($(HOST_OS),windows) - ifeq ($(USE_MINGW),) -# Case where we're building windows but not under linux (so it must be cygwin) -# In this case, gcc cygwin doesn't recognize -fvisibility=hidden - $(info libpng: Ignoring gcc flag $(common_CFLAGS) on Cygwin) - common_CFLAGS := - endif -endif - # For the host # ===================================================== @@ -55,6 +46,7 @@ LOCAL_SRC_FILES := $(common_SRC_FILES) LOCAL_CFLAGS += $(common_CFLAGS) LOCAL_ASFLAGS += $(common_ASFLAGS) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) +LOCAL_STATIC_LIBRARIES := libz LOCAL_MODULE:= libpng include $(BUILD_HOST_STATIC_LIBRARY) |