From 8d463532ff4b86a907ee067ea48fad6f7dd4b093 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Tue, 20 May 2014 12:17:51 -0400 Subject: [PATCH] Backed out changeset 8433a3609a54 (bug 1001320) for suspected B2G device image bustage. CLOSED TREE --- config/gcc_hidden_dso_handle.h | 11 ----------- config/system-headers | 14 +++++++++++--- configure.in | 18 ++++++++---------- dom/system/gonk/android_audio/AudioSystem.h | 4 ---- js/src/configure.in | 18 ++++++++---------- widget/gonk/GonkPermission.cpp | 1 - .../nativewindow/GonkNativeWindowClientJB.h | 3 +-- .../nativewindow/GonkNativeWindowClientKK.h | 3 +-- .../nativewindow/IGonkGraphicBufferConsumer.h | 7 +++---- 9 files changed, 32 insertions(+), 47 deletions(-) delete mode 100644 config/gcc_hidden_dso_handle.h diff --git a/config/gcc_hidden_dso_handle.h b/config/gcc_hidden_dso_handle.h deleted file mode 100644 index b42c50e75fe9..000000000000 --- a/config/gcc_hidden_dso_handle.h +++ /dev/null @@ -1,11 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifdef __cplusplus -extern "C" -#endif -void *__dso_handle; - -/* Begin all files as hidden visibility */ -#pragma GCC visibility push(hidden) diff --git a/config/system-headers b/config/system-headers index 6c0049395ecc..afe126a429f4 100644 --- a/config/system-headers +++ b/config/system-headers @@ -407,6 +407,9 @@ DriverServices.h DriverSynchronization.h DropInPanel.h dvidef.h +#ifdef ANDROID +EffectApi.h +#endif elf.h endian.h Entry.h @@ -513,8 +516,6 @@ gtk/gtkprinter.h gtk/gtkprintjob.h gtk/gtkprintunixdialog.h #ifdef ANDROID -gui/BufferQueue.h -gui/ConsumerBase.h gui/GraphicBufferAlloc.h gui/IConsumerListener.h gui/IGraphicBufferAlloc.h @@ -541,6 +542,14 @@ hlink.h HTTPBase.h #endif ia64/sys/inline.h +#ifdef ANDROID +IAudioFlingerClient.h +IAudioFlinger.h +IAudioRecord.h +IAudioTrack.h +IEffect.h +IEffectClient.h +#endif Icons.h iconv.h ieeefp.h @@ -902,7 +911,6 @@ rpc/types.h sane/sane.h sane/sanei.h sane/saneopts.h -sched.h Scrap.h Screen.h Script.h diff --git a/configure.in b/configure.in index 4e17a2ad3e81..d0a305a691a8 100644 --- a/configure.in +++ b/configure.in @@ -2550,19 +2550,17 @@ dnl =============================================================== if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE) AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE) - case "$OS_TARGET" in - Darwin) + if test -n "$gonkdir"; then + visibility_target=Gonk + else + visibility_target=$OS_TARGET + fi + case "$visibility_target" in + Darwin|Gonk) VISIBILITY_FLAGS='-fvisibility=hidden' ;; *) - case $GCC_VERSION in - 4.4*) - VISIBILITY_FLAGS='-I$(DIST)/system_wrappers -include $(topsrcdir)/config/gcc_hidden_dso_handle.h' - ;; - *) - VISIBILITY_FLAGS='-I$(DIST)/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h' - ;; - esac + VISIBILITY_FLAGS='-I$(DIST)/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h' WRAP_SYSTEM_INCLUDES=1 ;; esac diff --git a/dom/system/gonk/android_audio/AudioSystem.h b/dom/system/gonk/android_audio/AudioSystem.h index c913b7819d08..a1a27427a4ed 100644 --- a/dom/system/gonk/android_audio/AudioSystem.h +++ b/dom/system/gonk/android_audio/AudioSystem.h @@ -17,8 +17,6 @@ #ifndef ANDROID_AUDIOSYSTEM_H_ #define ANDROID_AUDIOSYSTEM_H_ -#pragma GCC visibility push(default) - #include #include #include "IAudioFlinger.h" @@ -963,6 +961,4 @@ private: }; // namespace android -#pragma GCC visibility pop - #endif /*ANDROID_AUDIOSYSTEM_H_*/ diff --git a/js/src/configure.in b/js/src/configure.in index a3a18f1cbda9..7bf746a81555 100644 --- a/js/src/configure.in +++ b/js/src/configure.in @@ -2083,19 +2083,17 @@ dnl =============================================================== if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE) AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE) - case "$OS_TARGET" in - Darwin) + if test -n "$gonkdir"; then + visibility_target=Gonk + else + visibility_target=$OS_TARGET + fi + case "$visibility_target" in + Darwin|Gonk) VISIBILITY_FLAGS='-fvisibility=hidden' ;; *) - case $GCC_VERSION in - 4.4*) - VISIBILITY_FLAGS='-I$(DIST)/system_wrappers -include $(topsrcdir)/config/gcc_hidden_dso_handle.h' - ;; - *) - VISIBILITY_FLAGS='-I$(DIST)/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h' - ;; - esac + VISIBILITY_FLAGS='-I$(DIST)/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h' WRAP_SYSTEM_INCLUDES=1 ;; esac diff --git a/widget/gonk/GonkPermission.cpp b/widget/gonk/GonkPermission.cpp index d842551bcd91..1b8d667d1815 100644 --- a/widget/gonk/GonkPermission.cpp +++ b/widget/gonk/GonkPermission.cpp @@ -14,7 +14,6 @@ * limitations under the License. */ -#include #include #include #include diff --git a/widget/gonk/nativewindow/GonkNativeWindowClientJB.h b/widget/gonk/nativewindow/GonkNativeWindowClientJB.h index 4e56f7a62b5d..a6a0b0dd800c 100755 --- a/widget/gonk/nativewindow/GonkNativeWindowClientJB.h +++ b/widget/gonk/nativewindow/GonkNativeWindowClientJB.h @@ -31,10 +31,9 @@ #include #include -#include "mozilla/Types.h" #include "GonkBufferQueue.h" -struct MOZ_EXPORT ANativeWindow_Buffer; +struct ANativeWindow_Buffer; namespace android { diff --git a/widget/gonk/nativewindow/GonkNativeWindowClientKK.h b/widget/gonk/nativewindow/GonkNativeWindowClientKK.h index 136481610199..1ced95b9f008 100644 --- a/widget/gonk/nativewindow/GonkNativeWindowClientKK.h +++ b/widget/gonk/nativewindow/GonkNativeWindowClientKK.h @@ -27,10 +27,9 @@ #include #include -#include "mozilla/Types.h" #include "GonkBufferQueue.h" -struct MOZ_EXPORT ANativeWindow_Buffer; +struct ANativeWindow_Buffer; namespace android { diff --git a/widget/gonk/nativewindow/IGonkGraphicBufferConsumer.h b/widget/gonk/nativewindow/IGonkGraphicBufferConsumer.h index d480c861ffca..8107c381673f 100644 --- a/widget/gonk/nativewindow/IGonkGraphicBufferConsumer.h +++ b/widget/gonk/nativewindow/IGonkGraphicBufferConsumer.h @@ -27,7 +27,6 @@ #include #include -#include "mozilla/Types.h" #include "mozilla/layers/LayersSurfaces.h" namespace mozilla { @@ -40,9 +39,9 @@ class TextureClient; namespace android { // ---------------------------------------------------------------------------- -class MOZ_EXPORT IConsumerListener; -class MOZ_EXPORT GraphicBuffer; -class MOZ_EXPORT Fence; +class IConsumerListener; +class GraphicBuffer; +class Fence; class IGonkGraphicBufferConsumer : public IInterface { typedef mozilla::layers::TextureClient TextureClient;