Bug 710029 - Assorted build system tweaks for B2G/Gonk. r=khuey
authorMichael Wu <mwu@mozilla.com>
Fri, 16 Dec 2011 13:26:32 -0800
changeset 84460 be0fffc6b0d1f0c99afe59c930e702d725d961a7
parent 84459 26cce2f95d497e0273f68e2f339c8dc0cd630852
child 84461 74277c18e7ce4199836aa609cb7f8788d087633b
push idunknown
push userunknown
push dateunknown
reviewerskhuey
bugs710029
milestone11.0a1
Bug 710029 - Assorted build system tweaks for B2G/Gonk. r=khuey
dom/sms/src/Makefile.in
embedding/Makefile.in
toolkit/mozapps/installer/packager.mk
xpcom/build/BinaryPath.h
--- a/dom/sms/src/Makefile.in
+++ b/dom/sms/src/Makefile.in
@@ -39,17 +39,17 @@ topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = \
   $(srcdir) \
   $(srcdir)/ipc \
   $(NULL)
 
 include $(DEPTH)/config/autoconf.mk
 
-ifeq (Android,$(OS_TARGET))
+ifeq (android,$(MOZ_WIDGET_TOOLKIT))
 VPATH += $(srcdir)/android
 else
 VPATH += $(srcdir)/fallback
 endif
 
 LIBRARY_NAME     = dom_sms_s
 LIBXUL_LIBRARY   = 1
 FORCE_STATIC_LIB = 1
--- a/embedding/Makefile.in
+++ b/embedding/Makefile.in
@@ -49,14 +49,14 @@ MODULE       = embed
 DIRS = base components browser
 
 ifdef ENABLE_TESTS
 XPCSHELL_TESTS = tests/unit
 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
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -318,17 +318,17 @@ ABI_DIR = x86
 else
 ifdef MOZ_THUMB2
 ABI_DIR = armeabi-v7a
 else
 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)
 endif
 
 PKG_SUFFIX      = .apk
 INNER_MAKE_PACKAGE	= \
   make -C $(GECKO_APP_AP_PATH) gecko.ap_ && \
--- a/xpcom/build/BinaryPath.h
+++ b/xpcom/build/BinaryPath.h
@@ -89,17 +89,17 @@ private:
     if (CFURLGetFileSystemRepresentation(executableURL, false, (UInt8 *)aResult, MAXPATHLEN))
       rv = NS_OK;
     else
       rv = NS_ERROR_FAILURE;
     CFRelease(executableURL);
     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
     // bootstrap code.
     const char *greHome = getenv("GRE_HOME");
     if (!greHome)
       return NS_ERROR_FAILURE;