Bug 1063966 - Stop building and uploading gecko-unsigned-unaligned.apk. r?nthomas draft
authorNick Alexander <nalexander@mozilla.com>
Thu, 24 Mar 2016 13:53:41 -0700
changeset 344572 57118ee81edffd7f855bb659a179917db3df6339
parent 344571 147fbcefe7e4db5437809c7365c31342ca6e46fe
child 516988 9cf02f9ae8036666b837a153e6bc0d098ff31918
push id13861
push usernalexander@mozilla.com
push dateThu, 24 Mar 2016 20:57:08 +0000
reviewersnthomas
bugs1063966
milestone48.0a1
Bug 1063966 - Stop building and uploading gecko-unsigned-unaligned.apk. r?nthomas This is still referenced out of tree, but only to optionally (!) find it or to ignore it: http://mxr.mozilla.org/build/search?string=unsigned-unaligned&find=&findi=&filter=%5E%5B%5E%5C0%5D*%24&hitlimit=&tree=build MozReview-Commit-ID: Hq0TPVDzWOy
testing/mozharness/scripts/release/antivirus.py
testing/mozharness/scripts/release/beet_mover.py
testing/mozharness/scripts/release/push-candidate-to-releases.py
toolkit/mozapps/installer/upload-files-APK.mk
--- a/testing/mozharness/scripts/release/antivirus.py
+++ b/testing/mozharness/scripts/release/antivirus.py
@@ -64,17 +64,16 @@ class AntivirusScan(BaseScript, Virtuale
         r"^.*\.asc$",
         r"^.*/partner-repacks.*$",
         r"^.*.checksums(\.asc)?$",
         r"^.*/logs/.*$",
         r"^.*/jsshell.*$",
         r"^.*json$",
         r"^.*/host.*$",
         r"^.*/mar-tools/.*$",
-        r"^.*gecko-unsigned-unaligned.apk$",
         r"^.*robocop.apk$",
         r"^.*contrib.*"
     ]
     CACHE_DIR = 'cache'
 
     def __init__(self):
         BaseScript.__init__(self,
             config_options=self.config_options,
--- a/testing/mozharness/scripts/release/beet_mover.py
+++ b/testing/mozharness/scripts/release/beet_mover.py
@@ -97,17 +97,16 @@ DEFAULT_EXCLUDES = [
     r"^.*\.asc$",
     r"^.*/partner-repacks.*$",
     r"^.*.checksums(\.asc)?$",
     r"^.*/logs/.*$",
     r"^.*/jsshell.*$",
     r"^.*json$",
     r"^.*/host.*$",
     r"^.*/mar-tools/.*$",
-    r"^.*gecko-unsigned-unaligned.apk$",
     r"^.*robocop.apk$",
     r"^.*contrib.*"
 ]
 CACHE_DIR = 'cache'
 
 
 class BeetMover(BaseScript, VirtualenvMixin, object):
     def __init__(self, aws_creds):
--- a/testing/mozharness/scripts/release/push-candidate-to-releases.py
+++ b/testing/mozharness/scripts/release/push-candidate-to-releases.py
@@ -99,17 +99,16 @@ class ReleasePusher(BaseScript, Virtuale
                 r"^.*\.txt$",
                 r"^.*/partner-repacks.*$",
                 r"^.*.checksums(\.asc)?$",
                 r"^.*/logs/.*$",
                 r"^.*/jsshell.*$",
                 r"^.*json$",
                 r"^.*/host.*$",
                 r"^.*/mar-tools/.*$",
-                r"^.*gecko-unsigned-unaligned.apk$",
                 r"^.*robocop.apk$",
                 r"^.*contrib.*"
             ]
 
     def _get_candidates_prefix(self):
         return "pub/{}/candidates/{}-candidates/build{}/".format(
             self.config['product'],
             self.config["version"],
--- a/toolkit/mozapps/installer/upload-files-APK.mk
+++ b/toolkit/mozapps/installer/upload-files-APK.mk
@@ -54,18 +54,16 @@ DIST_FILES += \
   update.locale \
   removed-files \
   $(NULL)
 
 NON_DIST_FILES = \
   classes.dex \
   $(NULL)
 
-UPLOAD_EXTRA_FILES += gecko-unsigned-unaligned.apk
-
 DIST_FILES += $(MOZ_CHILD_PROCESS_NAME)
 
 GECKO_APP_AP_PATH = $(topobjdir)/mobile/android/base
 
 ifdef ENABLE_TESTS
 INNER_ROBOCOP_PACKAGE=true
 ifeq ($(MOZ_BUILD_APP),mobile/android)
 UPLOAD_EXTRA_FILES += robocop.apk
@@ -245,17 +243,16 @@ INNER_MAKE_APK = \
     $(ZIP) $(if $(ALREADY_SZIPPED),-0 ,$(if $(MOZ_ENABLE_SZIP),-0 ))$(ABS_DIST)/gecko.ap_ $(ASSET_SO_LIBRARIES) && \
     $(ZIP) -r9D $(ABS_DIST)/gecko.ap_ $(DIST_FILES) -x $(NON_DIST_FILES) $(SZIP_LIBRARIES) && \
     $(if $(filter-out ./,$(OMNIJAR_DIR)), \
       mkdir -p $(OMNIJAR_DIR) && mv $(OMNIJAR_NAME) $(OMNIJAR_DIR) && ) \
     $(ZIP) -0 $(ABS_DIST)/gecko.ap_ $(OMNIJAR_DIR)$(OMNIJAR_NAME)) && \
   rm -f $(ABS_DIST)/gecko.apk && \
   cp $(ABS_DIST)/gecko.ap_ $(ABS_DIST)/gecko.apk && \
   $(ZIP) -j0 $(ABS_DIST)/gecko.apk $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/classes.dex && \
-  cp $(ABS_DIST)/gecko.apk $(ABS_DIST)/gecko-unsigned-unaligned.apk && \
   $(RELEASE_JARSIGNER) $(ABS_DIST)/gecko.apk && \
   $(ZIPALIGN) -f -v 4 $(ABS_DIST)/gecko.apk $(PACKAGE)
 
 ifeq ($(MOZ_BUILD_APP),mobile/android)
 INNER_MAKE_PACKAGE = \
   $(INNER_SZIP_LIBRARIES) && \
   make -C $(GECKO_APP_AP_PATH) gecko-nodeps.ap_ && \
   cp $(GECKO_APP_AP_PATH)/gecko-nodeps.ap_ $(ABS_DIST)/gecko.ap_ && \