aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Turner <digit@android.com>2010-12-07 06:38:24 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-12-07 06:38:24 -0800
commit3eb66a02a40c9f4005fc122e8614b5ed49f6c896 (patch)
tree6f655008b702046b76bb3eb1c2ac3288e97dfe98
parent4ce0ee15f268e0161438b4133936cb2826f7fd50 (diff)
parent1e0a1b89d72d527a388ea66a298c06f22da39f42 (diff)
downloadexternal_libpng-3eb66a02a40c9f4005fc122e8614b5ed49f6c896.zip
external_libpng-3eb66a02a40c9f4005fc122e8614b5ed49f6c896.tar.gz
external_libpng-3eb66a02a40c9f4005fc122e8614b5ed49f6c896.tar.bz2
am 1e0a1b89: Merge "libpng: use GCC visibility to reduce shared library size"
* commit '1e0a1b89d72d527a388ea66a298c06f22da39f42': libpng: use GCC visibility to reduce shared library size
-rw-r--r--Android.mk3
-rw-r--r--pngconf.h6
2 files changed, 7 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 2a6eb43..d5c81d7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,7 +22,8 @@ common_SRC_FILES := \
pngwtran.c \
pngwutil.c
-common_CFLAGS := ## -fomit-frame-pointer
+common_CFLAGS := \
+ -fvisibility=hidden ## -fomit-frame-pointer
common_C_INCLUDES += \
diff --git a/pngconf.h b/pngconf.h
index 27c9c32..806b8e5 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1509,7 +1509,11 @@ typedef z_stream FAR * png_zstreamp;
# define PNGAPI
#endif
#ifndef PNG_IMPEXP
-# define PNG_IMPEXP
+# if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33)
+# define PNG_IMPEXP __attribute__((visibility ("default")))
+# else
+# define PNG_IMPEXP
+# endif
#endif
#ifdef PNG_BUILDSYMS