mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 710029 - Assorted build system tweaks for B2G/Gonk. r=khuey
This commit is contained in:
parent
18192c5284
commit
c95ce8cb7c
@ -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
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user