mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-24 05:11:16 +00:00
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 --HG-- extra : rebase_source : 2e3dcfc516a6bcc5fd0517ca8bd98a4df7358251 extra : amend_source : f65baf2789517f5bd38384db89c6d2ea3d84676f extra : histedit_source : b901d25f4cbbf8bcecdf464a6042b5a44d51bea8
This commit is contained in:
parent
9f1aa81bb1
commit
6a068eb98f
@ -174,8 +174,6 @@ def GetUrlProperties(output, package):
|
||||
('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')),
|
||||
|
@ -98,8 +98,6 @@ class MakeUploadOutputParser(OutputParser):
|
||||
('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"),
|
||||
@ -1520,8 +1518,6 @@ or run without that action (ie: --no-{action})"
|
||||
('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
|
||||
|
@ -69,7 +69,6 @@ class AntivirusScan(BaseScript, VirtualenvMixin):
|
||||
r"^.*json$",
|
||||
r"^.*/host.*$",
|
||||
r"^.*/mar-tools/.*$",
|
||||
r"^.*gecko-unsigned-unaligned.apk$",
|
||||
r"^.*robocop.apk$",
|
||||
r"^.*contrib.*"
|
||||
]
|
||||
|
@ -102,7 +102,6 @@ DEFAULT_EXCLUDES = [
|
||||
r"^.*json$",
|
||||
r"^.*/host.*$",
|
||||
r"^.*/mar-tools/.*$",
|
||||
r"^.*gecko-unsigned-unaligned.apk$",
|
||||
r"^.*robocop.apk$",
|
||||
r"^.*contrib.*"
|
||||
]
|
||||
|
@ -104,7 +104,6 @@ class ReleasePusher(BaseScript, VirtualenvMixin):
|
||||
r"^.*json$",
|
||||
r"^.*/host.*$",
|
||||
r"^.*/mar-tools/.*$",
|
||||
r"^.*gecko-unsigned-unaligned.apk$",
|
||||
r"^.*robocop.apk$",
|
||||
r"^.*contrib.*"
|
||||
]
|
||||
|
@ -59,8 +59,6 @@ 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
|
||||
@ -250,7 +248,6 @@ INNER_MAKE_APK = \
|
||||
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)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user