Backed out changeset 41845f57045f (bug 896063) for breaking build on gonk-jb
authorMichael Wu <mwu@mozilla.com>
Thu, 25 Jul 2013 10:24:21 -0400
changeset 140082 fa54d010837f36722822d2917ce2fcf2b6b37395
parent 140074 41845f57045f8f9773e208257ba57b43906b319f
child 140083 5b3e1692ebdeb7d5ab674f5a88fccacde25ea163
push id31589
push userryanvm@gmail.com
push dateFri, 26 Jul 2013 01:59:11 +0000
treeherdermozilla-inbound@13e83433293b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs896063
milestone25.0a1
backs out41845f57045f8f9773e208257ba57b43906b319f
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 41845f57045f (bug 896063) for breaking build on gonk-jb
configure.in
--- a/configure.in
+++ b/configure.in
@@ -210,18 +210,17 @@ if test -n "$gonkdir" ; then
         GONK_INCLUDES="-I$gonkdir/frameworks/base/opengl/include -I$gonkdir/frameworks/base/native/include -I$gonkdir/frameworks/base/include -I$gonkdir/frameworks/base/services/camera -I$gonkdir/frameworks/base/include/media/stagefright -I$gonkdir/frameworks/base/include/media/stagefright/openmax -I$gonkdir/frameworks/base/media/libstagefright/rtsp -I$gonkdir/frameworks/base/media/libstagefright/include -I$gonkdir/external/dbus -I$gonkdir/external/bluetooth/bluez/lib -I$gonkdir/dalvik/libnativehelper/include/nativehelper"
         MOZ_B2G_BT=1
         MOZ_B2G_CAMERA=1
         MOZ_OMX_DECODER=1
         AC_DEFINE(MOZ_OMX_DECODER)
         AC_SUBST(MOZ_OMX_DECODER)
         ;;
     17)
-        GONK_INCLUDES="-I$gonkdir/frameworks/native/include -I$gonkdir/external/dbus -I$gonkdir/external/bluetooth/bluez/lib"
-        MOZ_B2G_BT=1
+        GONK_INCLUDES="-I$gonkdir/frameworks/native/include"
         ;;
     *)
         AC_MSG_ERROR([Unsupported platform version: $ANDROID_VERSION])
         ;;
     esac
     CPPFLAGS="-DANDROID -isystem $gonkdir/bionic/libc/$ARCH_DIR/include -isystem $gonkdir/bionic/libc/include/ -isystem $gonkdir/bionic/libc/kernel/common -isystem $gonkdir/bionic/libc/kernel/$ARCH_DIR -isystem $gonkdir/bionic/libm/include -I$gonkdir/system -I$gonkdir/system/core/include -isystem $gonkdir/bionic -I$gonkdir/hardware/libhardware/include -I$gonkdir/external/valgrind/fxos-include $GONK_INCLUDES $CPPFLAGS"
     CFLAGS="-mandroid -fno-short-enums -fno-exceptions $CFLAGS"
     CXXFLAGS="-mandroid -fno-short-enums -fno-exceptions -Wno-psabi $CXXFLAGS $STLPORT_CPPFLAGS"