am 00376b4d: Avoid a harmless potential integer overflow in png_XYZ_from_xy().
* commit '00376b4d52bf66dbc43b0452321af12a2791b604':
Avoid a harmless potential integer overflow in png_XYZ_from_xy().
diff --git a/Android.mk b/Android.mk
index 704e882..959b73c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -38,40 +38,16 @@
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
-
-ifeq ($(HOST_OS),darwin)
-common_CFLAGS += -no-integrated-as
-common_ASFLAGS += -no-integrated-as
-endif
-
-common_C_INCLUDES +=
-
-common_COPY_HEADERS_TO := libpng
-common_COPY_HEADERS := png.h pngconf.h pngusr.h
-
# For the host
# =====================================================
include $(CLEAR_VARS)
-
LOCAL_SRC_FILES := $(common_SRC_FILES)
LOCAL_CFLAGS += $(common_CFLAGS)
LOCAL_ASFLAGS += $(common_ASFLAGS)
-LOCAL_C_INCLUDES += $(common_C_INCLUDES) external/zlib
-
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+LOCAL_STATIC_LIBRARIES := libz
LOCAL_MODULE:= libpng
-
-LOCAL_COPY_HEADERS_TO := $(common_COPY_HEADERS_TO)
-LOCAL_COPY_HEADERS := $(common_COPY_HEADERS)
-
include $(BUILD_HOST_STATIC_LIBRARY)
@@ -87,14 +63,10 @@
LOCAL_SRC_FILES_arm := $(my_src_files_arm)
LOCAL_CFLAGS_arm64 := $(my_cflags_arm64)
LOCAL_SRC_FILES_arm64 := $(my_src_files_arm)
-
-LOCAL_C_INCLUDES += $(common_C_INCLUDES) \
- external/zlib
-LOCAL_SHARED_LIBRARIES := \
- libz
-
+LOCAL_ADDRESS_SANITIZER := false
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+LOCAL_SHARED_LIBRARIES := libz
LOCAL_MODULE:= libpng
-
include $(BUILD_STATIC_LIBRARY)
# For the device (shared)
@@ -109,17 +81,9 @@
LOCAL_SRC_FILES_arm := $(my_src_files_arm)
LOCAL_CFLAGS_arm64 := $(my_cflags_arm64)
LOCAL_SRC_FILES_arm64 := $(my_src_files_arm)
-
-LOCAL_C_INCLUDES += $(common_C_INCLUDES) \
- external/zlib
-LOCAL_SHARED_LIBRARIES := \
- libz
-
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+LOCAL_SHARED_LIBRARIES := libz
LOCAL_MODULE:= libpng
-
-LOCAL_COPY_HEADERS_TO := $(common_COPY_HEADERS_TO)
-LOCAL_COPY_HEADERS := $(common_COPY_HEADERS)
-
include $(BUILD_SHARED_LIBRARY)
# For testing
@@ -127,7 +91,6 @@
include $(CLEAR_VARS)
LOCAL_CLANG := true
-LOCAL_C_INCLUDES:= $(common_C_INCLUDES) external/zlib
LOCAL_SRC_FILES:= pngtest.c
LOCAL_MODULE := pngtest
LOCAL_SHARED_LIBRARIES:= libpng libz
