This change appears to break skia, but I'm not convinced that its because skia and libpng were working correctly in the first place. Reverting pending a better understanding of the issue.
This reverts commit 1baa2e21111fb8cdc3d8c1fe5179975709913213
diff --git a/Android.mk b/Android.mk
index c89472e..4e92908 100644
--- a/Android.mk
+++ b/Android.mk
@@ -59,9 +59,9 @@
# =====================================================
include $(CLEAR_VARS)
-LOCAL_CLANG := true
+
LOCAL_SRC_FILES := $(common_SRC_FILES)
-LOCAL_CFLAGS += $(common_CFLAGS) -ftrapv
+LOCAL_CFLAGS += $(common_CFLAGS)
LOCAL_C_INCLUDES += $(common_C_INCLUDES) \
external/zlib
LOCAL_SHARED_LIBRARIES := \
@@ -73,3 +73,5 @@
LOCAL_COPY_HEADERS := $(common_COPY_HEADERS)
include $(BUILD_STATIC_LIBRARY)
+
+