diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-11-18 15:40:08 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-11-18 15:40:08 -0800 |
| commit | 41e4a032ef9f599ea597dcdff1797f0ea49bdd97 (patch) | |
| tree | 902c7654243d6dfd662c157c5d57e1aa2e88696a /Android.mk | |
| parent | fb9d57017268c5cbe74145e3a677b473b14e0e36 (diff) | |
| parent | deba48b32d593851724bdce88dd9b754c4722645 (diff) | |
| download | external_libpng-41e4a032ef9f599ea597dcdff1797f0ea49bdd97.zip external_libpng-41e4a032ef9f599ea597dcdff1797f0ea49bdd97.tar.gz external_libpng-41e4a032ef9f599ea597dcdff1797f0ea49bdd97.tar.bz2 | |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/libpng into mr1-staging
Change-Id: I47ac09bc237a707c0f744e7757c89f0c83744602
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 27 |
1 files changed, 11 insertions, 16 deletions
@@ -22,7 +22,7 @@ common_SRC_FILES := \ pngwtran.c \ pngwutil.c -common_CFLAGS := -fvisibility=hidden ## -fomit-frame-pointer +common_CFLAGS := -std=gnu89 -fvisibility=hidden ## -fomit-frame-pointer ifeq ($(HOST_OS),windows) ifeq ($(USE_MINGW),) @@ -64,9 +64,9 @@ ifeq ($(ARCH_ARM_HAVE_NEON),true) endif include $(CLEAR_VARS) - +LOCAL_CLANG := true LOCAL_SRC_FILES := $(common_SRC_FILES) -LOCAL_CFLAGS += $(common_CFLAGS) +LOCAL_CFLAGS += $(common_CFLAGS) -ftrapv LOCAL_C_INCLUDES += $(common_C_INCLUDES) \ external/zlib LOCAL_SHARED_LIBRARIES := \ @@ -79,18 +79,13 @@ LOCAL_COPY_HEADERS := $(common_COPY_HEADERS) include $(BUILD_STATIC_LIBRARY) +# For testing +# ===================================================== include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(common_SRC_FILES) -LOCAL_CFLAGS += $(common_CFLAGS) -LOCAL_C_INCLUDES += $(common_C_INCLUDES) \ - external/zlib -LOCAL_SHARED_LIBRARIES := \ - libz - -LOCAL_MODULE:= libpng - -LOCAL_PRELINK_MODULE := false - -include $(BUILD_SHARED_LIBRARY) +LOCAL_C_INCLUDES:= $(common_C_INCLUDES) external/zlib +LOCAL_SRC_FILES:= $(common_SRC_FILES) pngtest.c +LOCAL_MODULE := pngtest +LOCAL_SHARED_LIBRARIES:= libz +LOCAL_MODULE_TAGS := debug +include $(BUILD_EXECUTABLE) |