diff options
| author | Stephen Hines <srhines@google.com> | 2012-08-03 17:25:20 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2012-08-03 18:22:57 -0700 |
| commit | deba48b32d593851724bdce88dd9b754c4722645 (patch) | |
| tree | c0e5b2495b313dde9b0f92594539d7c65c615192 | |
| parent | c1f268626608d7cc8265623897a513afae82316b (diff) | |
| download | external_libpng-deba48b32d593851724bdce88dd9b754c4722645.zip external_libpng-deba48b32d593851724bdce88dd9b754c4722645.tar.gz external_libpng-deba48b32d593851724bdce88dd9b754c4722645.tar.bz2 | |
Switch back to LOCAL_CLANG with -std=gnu89.
The root issue here is that Clang was defaulting to gnu99, which has different
semantics for inline functions (that are not in fact bugs). Switching back to
gnu89 (like gcc was defaulting to) resolves the link problem.
Change-Id: I4fa786aff18ef3f435f83b4a5f1a3ee9dc039432
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 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),) @@ -59,7 +59,7 @@ include $(BUILD_HOST_STATIC_LIBRARY) # ===================================================== include $(CLEAR_VARS) -# LOCAL_CLANG := true +LOCAL_CLANG := true LOCAL_SRC_FILES := $(common_SRC_FILES) LOCAL_CFLAGS += $(common_CFLAGS) -ftrapv LOCAL_C_INCLUDES += $(common_C_INCLUDES) \ |