Bug 703680 - support both embedding/android and mobile/android/base. r=khuey
authorDoug Turner <dougt@dougt.org>
Fri, 18 Nov 2011 13:17:40 -0800
changeset 81253 20ad9c9e40539b37f018c756b5b3771f385a0889
parent 81252 98908e7e477e7f3364391e64f203b070b08515e4
child 81254 b370bc4a61748d53f7aaeaa7a6b5619bd057e148
push id628
push userclegnitto@mozilla.com
push dateWed, 21 Dec 2011 14:41:57 +0000
treeherdermozilla-aurora@24a61ad789e8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs703680
milestone11.0a1
Bug 703680 - support both embedding/android and mobile/android/base. r=khuey
embedding/Makefile.in
toolkit/mozapps/installer/packager.mk
--- a/embedding/Makefile.in
+++ b/embedding/Makefile.in
@@ -49,12 +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)
 DIRS += android
 endif
+endif
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -314,20 +314,26 @@ ABI_DIR = x86
 else
 ifdef MOZ_THUMB2
 ABI_DIR = armeabi-v7a
 else
 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) && \
     rm -f lib.id && \
     for SOMELIB in *.so ; \
     do \
       printf "`basename $$SOMELIB`:`$(_ABS_DIST)/host/bin/file_id $$SOMELIB`\n" >> lib.id ; \
     done && \