diff options
| author | Geremy Condra <gcondra@google.com> | 2012-06-06 12:41:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-06 12:41:35 -0700 |
| commit | f689fc8d7b4ff77a1be3060738cc776303643315 (patch) | |
| tree | 5c08f28ed73c4c33d406626cda0429f65ce64daf | |
| parent | 1baa2e21111fb8cdc3d8c1fe5179975709913213 (diff) | |
| download | external_libpng-f689fc8d7b4ff77a1be3060738cc776303643315.zip external_libpng-f689fc8d7b4ff77a1be3060738cc776303643315.tar.gz external_libpng-f689fc8d7b4ff77a1be3060738cc776303643315.tar.bz2 | |
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
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 4 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) -ftrapv +LOCAL_CFLAGS += $(common_CFLAGS) LOCAL_C_INCLUDES += $(common_C_INCLUDES) \ external/zlib LOCAL_SHARED_LIBRARIES := \ @@ -73,3 +73,5 @@ LOCAL_COPY_HEADERS_TO := $(common_COPY_HEADERS_TO) LOCAL_COPY_HEADERS := $(common_COPY_HEADERS) include $(BUILD_STATIC_LIBRARY) + + |