commit 1e0a1b89d72d527a388ea66a298c06f22da39f42
author David Turner <digit@android.com> Tue Dec 07 06:28:51 2010 -0800
committer Android Code Review <code-review@android.com> Tue Dec 07 06:28:51 2010 -0800
tree 27bae8d6e6f777b68b407e21379adbb077a10d84
parent 5f6bd84e375226bf228fc8ac90318957ec9e1e7f
parent 1cb15eb3049b918c8c1363e874f2efb491cbb534

Merge "libpng: use GCC visibility to reduce shared library size"

Android.mk

diff --git a/Android.mk b/Android.mk
index 2a6eb43..d5c81d7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,7 +22,8 @@
 	pngwtran.c \
 	pngwutil.c
 
-common_CFLAGS := ## -fomit-frame-pointer
+common_CFLAGS := \
+	-fvisibility=hidden ## -fomit-frame-pointer
 
 common_C_INCLUDES += \
 

pngconf.h

diff --git a/pngconf.h b/pngconf.h
index defc16d..5760ba3 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1505,7 +1505,11 @@
 #  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