Bug 728924 - Fix MOZ_JAVA_COMPOSITOR definition. r=joe

This commit is contained in:
Benoit Girard 2012-02-20 13:57:40 -05:00
parent ae8d75ec5b
commit 3222ae5ea8
3 changed files with 9 additions and 8 deletions

View File

@ -5531,6 +5531,15 @@ if test -n "$MOZ_ANDROID_HISTORY"; then
AC_DEFINE(MOZ_ANDROID_HISTORY)
fi
dnl ========================================================
dnl = Build with the Android Java compositor
dnl ========================================================
if test -n "$MOZ_JAVA_COMPOSITOR"; then
dnl Do this if defined in confvars.sh
AC_DEFINE(MOZ_JAVA_COMPOSITOR)
fi
dnl ========================================================
dnl = Disable WebSMS backend
dnl ========================================================

View File

@ -132,10 +132,6 @@ endif
endif
endif
ifdef MOZ_JAVA_COMPOSITOR
DEFINES += -DMOZ_JAVA_COMPOSITOR
endif
LOCAL_INCLUDES += \
-DSK_BUILD_FOR_ANDROID_NDK \
-I$(topsrcdir)/widget/android \

View File

@ -51,10 +51,6 @@ MODULE_NAME = nsWidgetAndroidModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
ifdef MOZ_JAVA_COMPOSITOR
DEFINES += -DMOZ_JAVA_COMPOSITOR
endif
ifdef MOZ_ONLY_TOUCH_EVENTS
DEFINES += -DMOZ_ONLY_TOUCH_EVENTS
endif