diff options
| author | Geremy Condra <gcondra@google.com> | 2012-06-05 15:17:48 -0700 |
|---|---|---|
| committer | Geremy Condra <gcondra@google.com> | 2012-06-12 10:27:40 -0700 |
| commit | 14cab8628b01f030647fb0a42dac7a5c031bb50e (patch) | |
| tree | b1f27ff655a8fdcd4aa7b5f77cc6acf6e1e6c268 /Android.mk | |
| parent | d0a25c6df9fca7221ce72027701df4e1eb59cb16 (diff) | |
| download | external_libpng-14cab8628b01f030647fb0a42dac7a5c031bb50e.zip external_libpng-14cab8628b01f030647fb0a42dac7a5c031bb50e.tar.gz external_libpng-14cab8628b01f030647fb0a42dac7a5c031bb50e.tar.bz2 | |
Add signed integer overflow checking to libpng.
This change moves libpng over to Clang in order to take advantage
of its stronger -ftrapv option, causing the code to abort rather
than allowing a signed integer overflow.
This change depends on Ida05e2d746a88913fc354224a7c660f7570e3adc
and I463217aef573a28069469514ad94cd85a7f38bea.
Change-Id: I03e6d217fc01ee6429a9a4d5d593379e06c4ef29
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -59,9 +59,9 @@ include $(BUILD_HOST_STATIC_LIBRARY) # ===================================================== 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 := \ @@ -74,4 +74,13 @@ LOCAL_COPY_HEADERS := $(common_COPY_HEADERS) include $(BUILD_STATIC_LIBRARY) +# For testing +# ===================================================== +include $(CLEAR_VARS) +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) |