diff --git a/dom/sms/src/Makefile.in b/dom/sms/src/Makefile.in
index 15bb688f399..fe918185b3a 100644
--- a/dom/sms/src/Makefile.in
+++ b/dom/sms/src/Makefile.in
@@ -44,7 +44,7 @@ VPATH            = \
 
 include $(DEPTH)/config/autoconf.mk
 
-ifeq (Android,$(OS_TARGET))
+ifeq (android,$(MOZ_WIDGET_TOOLKIT))
 VPATH += $(srcdir)/android
 else
 VPATH += $(srcdir)/fallback
diff --git a/embedding/Makefile.in b/embedding/Makefile.in
index b6f74b1d8c1..ff0747e5815 100644
--- a/embedding/Makefile.in
+++ b/embedding/Makefile.in
@@ -54,7 +54,7 @@ DIRS += test
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),android)
-ifeq ($(MOZ_BUILD_APP),mobile/xul)
+ifneq (,$(filter mobile/xul b2g,$(MOZ_BUILD_APP)))
 DIRS += android
 endif
 endif
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index b18cd2e4097..a1381c299d4 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -323,7 +323,7 @@ ABI_DIR = armeabi
 endif
 endif
 
-ifeq ($(MOZ_BUILD_APP),mobile/xul)
+ifneq (,$(filter mobile/xul b2g,$(MOZ_BUILD_APP)))
 GECKO_APP_AP_PATH = $(call core_abspath,$(DEPTH)/embedding/android)
 else
 GECKO_APP_AP_PATH = $(call core_abspath,$(DEPTH)/mobile/android/base)
diff --git a/xpcom/build/BinaryPath.h b/xpcom/build/BinaryPath.h
index 0d657fc3d14..257c50ed20d 100644
--- a/xpcom/build/BinaryPath.h
+++ b/xpcom/build/BinaryPath.h
@@ -94,7 +94,7 @@ private:
     return rv;
   }
 
-#elif defined(ANDROID)
+#elif defined(MOZ_WIDGET_ANDROID)
   static nsresult Get(const char *argv0, char aResult[MAXPATHLEN])
   {
     // On Android, we use the GRE_HOME variable that is set by the Java