From: Nicolas Capens Date: Fri, 17 Apr 2015 20:36:51 +0000 (-0400) Subject: Remove -fvisibility=protected from Android.mk files. X-Git-Tag: android-x86-7.1-r1~1143 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1117115823e340667749862d661692f6fb6a2d19;p=android-x86%2Fexternal-swiftshader.git Remove -fvisibility=protected from Android.mk files. It causes Android-GCE to fail to boot. Change-Id: I7ad8a904ae39bc9d3548969471e5908276508d72 Reviewed-on: https://swiftshader-review.googlesource.com/2892 Reviewed-by: Nicolas Capens Tested-by: Nicolas Capens --- diff --git a/src/OpenGL/libEGL/Android.mk b/src/OpenGL/libEGL/Android.mk index d9fc910e3..df313fd5a 100644 --- a/src/OpenGL/libEGL/Android.mk +++ b/src/OpenGL/libEGL/Android.mk @@ -24,7 +24,6 @@ LOCAL_CFLAGS += -UNDEBUG -g -O0 #LOCAL_CFLAGS += -DANGLE_DISABLE_TRACE LOCAL_CFLAGS += -std=c++11 -LOCAL_CFLAGS += -fvisibility=protected # These changes tie the build to Cloud Android. Do something else # for other Android builds. diff --git a/src/OpenGL/libGLES_CM/Android.mk b/src/OpenGL/libGLES_CM/Android.mk index d60ddf7eb..5506a798a 100644 --- a/src/OpenGL/libGLES_CM/Android.mk +++ b/src/OpenGL/libGLES_CM/Android.mk @@ -88,7 +88,6 @@ LOCAL_SRC_FILES += \ LOCAL_CFLAGS += -DLOG_TAG=\"libGLES_CM_swiftshader\" LOCAL_CFLAGS += -fno-operator-names -msse2 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS LOCAL_CFLAGS += -std=c++11 -LOCAL_CFLAGS += -fvisibility=protected # Android's make system also uses NDEBUG, so we need to set/unset it forcefully # Uncomment for ON: diff --git a/src/OpenGL/libGLESv2/Android.mk b/src/OpenGL/libGLESv2/Android.mk index 421de06d1..64312a2e2 100644 --- a/src/OpenGL/libGLESv2/Android.mk +++ b/src/OpenGL/libGLESv2/Android.mk @@ -134,7 +134,6 @@ LOCAL_CFLAGS += -UNDEBUG -g -O0 LOCAL_CFLAGS += -fno-operator-names -msse2 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS LOCAL_CFLAGS += -std=c++11 -LOCAL_CFLAGS += -fvisibility=protected LOCAL_SHARED_LIBRARIES += libdl liblog libcutils libhardware libui libutils \ $(GCE_STLPORT_LIBS)