bug 702753 - implement make install for android r=dougt
authorBrad Lassey <blassey@mozilla.com>
Tue, 15 Nov 2011 18:05:23 -0500
changeset 83490 bcada4117c30569952236a8d2b34652f1a1ea83d
parent 83489 8d659ca1ae0e227d8da7e016a1f5b438bc05d3fe
child 83491 5352c48874e27ba93bdfc164db0c03e820a079c4
push id519
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 00:38:35 +0000
treeherdermozilla-beta@788ea1ef610b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdougt
bugs702753
milestone11.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 702753 - implement make install for android r=dougt
mobile/build.mk
--- a/mobile/build.mk
+++ b/mobile/build.mk
@@ -43,16 +43,18 @@ include $(topsrcdir)/toolkit/toolkit-tie
 else
 ifdef ENABLE_TESTS
 tier_testharness_dirs += \
   testing/mochitest \
   $(NULL)
 endif
 endif
 
+include  ../toolkit/mozapps/installer/package-name.mk
+
 TIERS += app
 
 ifdef MOZ_EXTENSIONS
 tier_app_dirs += extensions
 endif
 
 ifdef MOZ_SERVICES_SYNC
 tier_app_dirs += services
@@ -66,18 +68,22 @@ tier_app_dirs += \
 
 installer: 
 	@$(MAKE) -C mobile/installer installer
 
 package:
 	@$(MAKE) -C mobile/installer
 
 install::
+ifeq ($(OS_TARGET),Android)
+	$(ANDROID_PLATFORM_TOOLS)/adb install -r $(DIST)/$(PKG_PATH)$(PKG_BASENAME).apk
+else
 	@echo "Mobile can't be installed directly."
 	@exit 1
+endif
 
 deb: package
 	@$(MAKE) -C mobile/installer deb
 
 upload::
 	@$(MAKE) -C mobile/installer upload
 
 ifdef ENABLE_TESTS