Bug 719697 - [fix uploaded name] robocop isn't signed properly from buildbot builds. r=hwine
☠☠ backed out by 5221f1397829 ☠ ☠
authorJoel Maher <jmaher@mozilla.com>
Thu, 26 Jan 2012 22:26:47 -0500
changeset 86764 705d94f0a11ce500ae40b0ff2f93c2736a4f44b7
parent 86763 41cff9d2d95865ab058327679a1a464c0f859ac8
child 86765 f928b631a92da7f84ab7fd00673e0f132431f929
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershwine
bugs719697
milestone12.0a1
Bug 719697 - [fix uploaded name] robocop isn't signed properly from buildbot builds. r=hwine
toolkit/mozapps/installer/packager.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -332,22 +332,22 @@ endif
 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)
 endif
 
 INNER_ROBOCOP_PACKAGE=
 ifeq ($(MOZ_BUILD_APP),mobile/android)
-UPLOAD_EXTRA_FILES += robocop.apk
+UPLOAD_EXTRA_FILES += robocop.zip
 ROBOCOP_PATH = $(call core_abspath,$(_ABS_DIST)/../build/mobile/robocop)
 INNER_ROBOCOP_PACKAGE= \
   && $(APKBUILDER) $(_ABS_DIST)/robocop-raw.apk -v $(APKBUILDER_FLAGS) -z $(ROBOCOP_PATH)/robocop.ap_ -f $(ROBOCOP_PATH)/classes.dex \
   && $(JARSIGNER) $(_ABS_DIST)/robocop-raw.apk \
-  && $(ZIPALIGN) -f -v 4 $(_ABS_DIST)/robocop-raw.apk $(_ABS_DIST)/robocop.apk
+  && $(ZIPALIGN) -f -v 4 $(_ABS_DIST)/robocop-raw.apk $(_ABS_DIST)/robocop.zip
 endif
 
 PKG_SUFFIX      = .apk
 INNER_MAKE_PACKAGE	= \
   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) && \