wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 710029 - Assorted build system tweaks for B2G/Gonk. r=khuey

Browse Source
This commit is contained in:
Michael Wu 2011-12-16 13:26:32 -08:00
parent 18192c5284
commit c95ce8cb7c
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/sms/src/Makefile.in
View File

@ -44,7 +44,7 @@ VPATH = \
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
ifeq (Android,$(OS_TARGET)) ifeq (android,$(MOZ_WIDGET_TOOLKIT))
VPATH += $(srcdir)/android VPATH += $(srcdir)/android
else else
VPATH += $(srcdir)/fallback VPATH += $(srcdir)/fallback

2
embedding/Makefile.in
View File

@ -54,7 +54,7 @@ DIRS += test
endif endif
ifeq ($(MOZ_WIDGET_TOOLKIT),android) ifeq ($(MOZ_WIDGET_TOOLKIT),android)
ifeq ($(MOZ_BUILD_APP),mobile/xul) ifneq (,$(filter mobile/xul b2g,$(MOZ_BUILD_APP)))
DIRS += android DIRS += android
endif endif
endif endif

2
toolkit/mozapps/installer/packager.mk
View File

@ -323,7 +323,7 @@ ABI_DIR = armeabi
endif endif
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) GECKO_APP_AP_PATH = $(call core_abspath,$(DEPTH)/embedding/android)
else else
GECKO_APP_AP_PATH = $(call core_abspath,$(DEPTH)/mobile/android/base) GECKO_APP_AP_PATH = $(call core_abspath,$(DEPTH)/mobile/android/base)

2
xpcom/build/BinaryPath.h
View File

@ -94,7 +94,7 @@ private:
return rv; return rv;
} }
#elif defined(ANDROID) #elif defined(MOZ_WIDGET_ANDROID)
static nsresult Get(const char *argv0, char aResult[MAXPATHLEN]) static nsresult Get(const char *argv0, char aResult[MAXPATHLEN])
{ {
// On Android, we use the GRE_HOME variable that is set by the Java // On Android, we use the GRE_HOME variable that is set by the Java