Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 703680 - support both embedding/android and mobile/android/base. r=khuey

Browse Source
This commit is contained in:
Doug Turner 2011-11-18 13:17:40 -08:00
parent 1ad5e6d27b
commit 3d1f128709
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
embedding/Makefile.in
View File

@ -54,7 +54,9 @@ DIRS += test
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),android)
ifeq ($(MOZ_BUILD_APP),mobile/xul)
DIRS += android
endif
endif
include $(topsrcdir)/config/rules.mk

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

@ -319,10 +319,16 @@ ABI_DIR = armeabi
endif
endif
ifeq ($(MOZ_BUILD_APP),mobile/xul)
GECKO_APP_AP_PATH = ../embedding/android
else
GECKO_APP_AP_PATH = ../mobile/android/base
endif
PKG_SUFFIX = .apk
INNER_MAKE_PACKAGE = \
make -C ../embedding/android gecko.ap_ && \
cp ../embedding/android/gecko.ap_ $(_ABS_DIST) && \
make -C $(GECKO_APP_AP_PATH) gecko.ap_ && \
cp $(GECKO_APP_AP_PATH)/gecko.ap_ $(_ABS_DIST) && \
( cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && \
mkdir -p lib/$(ABI_DIR) && \
mv libmozutils.so $(MOZ_CHILD_PROCESS_NAME) lib/$(ABI_DIR) && \