Bug 1063966 - Stop building and uploading gecko-unsigned-unaligned.apk. r=nthomas
authorNick Alexander <nalexander@mozilla.com>
Thu, 24 Mar 2016 13:53:41 -0700
changeset 290850 e1c798332d3be8aed7b934d2e6b3982d5de7d902
parent 290849 5c5e48022d8330131f67902bccc3c39737d2a93d
child 290851 5777c32d2b391e43d9e5c23fea0c57324e125d72
push id19656
push usergwagner@mozilla.com
push dateMon, 04 Apr 2016 13:43:23 +0000
treeherderb2g-inbound@e99061fde28a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
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
build/upload.py
testing/mozharness/mozharness/mozilla/building/buildbase.py
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/build/upload.py
+++ b/build/upload.py
@@ -169,18 +169,16 @@ def GetMarProperties(filename):
 def GetUrlProperties(output, package):
     # let's create a switch case using name-spaces/dict
     # rather than a long if/else with duplicate code
     property_conditions = [
         # key: property name, value: condition
         ('symbolsUrl', lambda m: m.endswith('crashreporter-symbols.zip') or
                        m.endswith('crashreporter-symbols-full.zip')),
         ('testsUrl', lambda m: m.endswith(('tests.tar.bz2', 'tests.zip'))),
-        ('unsignedApkUrl', lambda m: m.endswith('apk') and
-                           'unsigned-unaligned' in m),
         ('robocopApkUrl', lambda m: m.endswith('apk') and 'robocop' in m),
         ('jsshellUrl', lambda m: 'jsshell-' in m and m.endswith('.zip')),
         ('completeMarUrl', lambda m: m.endswith('.complete.mar')),
         ('partialMarUrl', lambda m: m.endswith('.mar') and '.partial.' in m),
         ('codeCoverageURL', lambda m: m.endswith('code-coverage-gcno.zip')),
         ('sdkUrl', lambda m: m.endswith(('sdk.tar.bz2', 'sdk.zip'))),
         ('testPackagesUrl', lambda m: m.endswith('test_packages.json')),
         ('packageUrl', lambda m: m.endswith(package)),
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -93,18 +93,16 @@ class MakeUploadOutputParser(OutputParse
     tbpl_error_list = TBPL_UPLOAD_ERRORS
     # let's create a switch case using name-spaces/dict
     # rather than a long if/else with duplicate code
     property_conditions = [
         # key: property name, value: condition
         ('symbolsUrl', "m.endswith('crashreporter-symbols.zip') or "
                        "m.endswith('crashreporter-symbols-full.zip')"),
         ('testsUrl', "m.endswith(('tests.tar.bz2', 'tests.zip'))"),
-        ('unsignedApkUrl', "m.endswith('apk') and "
-                           "'unsigned-unaligned' in m"),
         ('robocopApkUrl', "m.endswith('apk') and 'robocop' in m"),
         ('jsshellUrl', "'jsshell-' in m and m.endswith('.zip')"),
         ('partialMarUrl', "m.endswith('.mar') and '.partial.' in m"),
         ('completeMarUrl', "m.endswith('.mar')"),
         ('codeCoverageUrl', "m.endswith('code-coverage-gcno.zip')"),
     ]
 
     def __init__(self, use_package_as_marfile=False, package_filename=None, **kwargs):
@@ -1515,18 +1513,16 @@ or run without that action (ie: --no-{ac
                                                write_to_file=True)
                     break
 
         property_conditions = [
             # key: property name, value: condition
             ('symbolsUrl', lambda m: m.endswith('crashreporter-symbols.zip') or
                            m.endswith('crashreporter-symbols-full.zip')),
             ('testsUrl', lambda m: m.endswith(('tests.tar.bz2', 'tests.zip'))),
-            ('unsignedApkUrl', lambda m: m.endswith('apk') and
-                               'unsigned-unaligned' in m),
             ('robocopApkUrl', lambda m: m.endswith('apk') and 'robocop' in m),
             ('jsshellUrl', lambda m: 'jsshell-' in m and m.endswith('.zip')),
             # Temporarily use "TC" in MarUrl parameters. We don't want to
             # override these to point to taskcluster just yet, and still
             # need to use FTP. However, they can't be removed outright since
             # that can affect packageUrl. See bug 1144985.
             ('completeMarUrlTC', lambda m: m.endswith('.complete.mar')),
             ('partialMarUrlTC', lambda m: m.endswith('.mar') and '.partial.' in m),
--- 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_ && \