Bug 898898 - Add support for building on gonk-JB MR2, r=glandium

b2g/app/Makefile.in

@@ -30,7 +30,7 @@ LIBS += \
   $(DEPTH)/widget/gonk/libdisplay/$(LIB_PREFIX)display.$(LIB_SUFFIX) \
   $(MOZ_ZLIB_LIBS) \
   $(NULL)
-ifeq (17,$(ANDROID_VERSION))
+ifeq (18,$(ANDROID_VERSION))
 LIBS += \
   -lgui \
   -lsuspend \

configure.in

@@ -214,7 +214,7 @@ if test -n "$gonkdir" ; then
         AC_DEFINE(MOZ_OMX_DECODER)
         AC_SUBST(MOZ_OMX_DECODER)
         ;;
-    17)
+    18)
         GONK_INCLUDES="-I$gonkdir/frameworks/native/include"
         ;;
     *)

toolkit/library/Makefile.in

@@ -96,6 +96,9 @@ endif #}
 
 ifdef MOZ_B2G_BT #{
 STATIC_LIBS += mozdbus_s
+ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
+OS_LIBS += -ldbus
+endif
 endif #}
 
 ifneq ($(strip $(MOZ_B2G_RIL)$(MOZ_B2G_BT)),) #{
@@ -446,7 +449,6 @@ OS_LIBS += \
   -lsysutils \
   -lcamera_client \
   -lsensorservice \
-  -ldbus \
   -lstagefright \
   -lstagefright_foundation \
   -lstagefright_omx \