Bug 1531689 - Prevent the stub from installing native AArch64 for version 66. r=agashlin a=lizzard
authorMatt Howell <mhowell@mozilla.com>
Thu, 07 Mar 2019 00:54:22 +0200
changeset 516280 051a0830599b133e1d6b5eea37feefa2ad497c7a
parent 516279 533b15ae2bde4c8d89723855a73248d9a84e7d51
child 516281 6dd6bcd4c1427c0c7d0e8b7e66c7f5a55143cd34
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersagashlin, lizzard
bugs1531689
milestone66.0
Bug 1531689 - Prevent the stub from installing native AArch64 for version 66. r=agashlin a=lizzard Reviewers: agashlin Reviewed By: agashlin Bug #: 1531689 Differential Revision: https://phabricator.services.mozilla.com/D22189
browser/installer/windows/nsis/stub.nsi
--- a/browser/installer/windows/nsis/stub.nsi
+++ b/browser/installer/windows/nsis/stub.nsi
@@ -1965,17 +1965,19 @@ FunctionEnd
 ; 2) An amount of RAM strictly greater than RAM_NEEDED_FOR_64BIT
 ; 3) No third-party products installed that cause issues with the 64-bit build.
 ;    Currently this includes Lenovo OneKey Theater and Lenovo Energy Management.
 ; If any of those checks fail, the 32-bit x86 build is selected.
 Function GetArchToInstall
   StrCpy $ArchToInstall ${ARCH_X86}
 
   ${If} ${IsNativeARM64}
-    StrCpy $ArchToInstall ${ARCH_AARCH64}
+    ; Disable installing the AArch64 build for this version
+    ; because we aren't publishing those builds yet.
+    ;StrCpy $ArchToInstall ${ARCH_AARCH64}
     Return
   ${EndIf}
 
   ${IfNot} ${IsNativeAMD64}
     Return
   ${EndIf}
 
   System::Call "*(i 64, i, l 0, l, l, l, l, l, l)p.r1"