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 | libpng-jb-mr1-dev.tar.gz |
Switch back to LOCAL_CLANG with -std=gnu89.android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1tools_r22.2tools_r22jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devjb-mr1.1-releasejb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-releasejb-mr1-dev-plus-aospjb-mr1-dev
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
diff --git a/Android.mk b/Android.mk index 77ed0e244..de76dd643 100644 --- a/Android.mk +++ b/Android.mk @@ -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) \ |