Bug 1481518 part 2: Enable aarch64 Windows chromium sandbox code. r=froydnj
authorBob Owen <bobowencode@gmail.com>
Fri, 14 Dec 2018 13:07:35 +0000
changeset 510592 9f01fb6fbbfd2c05cdfc7269e7575f1e7e2e769e
parent 510591 4c0f7afe671282b23fe272779115746736e823d6
child 510593 e4aa68e2a85b027c5498bf8d8f379b06d07df6c2
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)
reviewersfroydnj
bugs1481518
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1481518 part 2: Enable aarch64 Windows chromium sandbox code. r=froydnj
old-configure.in
security/sandbox/moz.build
--- a/old-configure.in
+++ b/old-configure.in
@@ -2955,23 +2955,16 @@ if test -n "$MOZ_TSAN" -o -n "$MOZ_ASAN"
     # Bug 1287971: LSan also conflicts with sandboxing on Linux.
     case $OS_TARGET in
     Linux|Android)
         MOZ_SANDBOX=
         ;;
     esac
 fi
 
-case "$OS_TARGET:$CPU_ARCH" in
-WINNT:aarch64)
-    # No sandbox support on AArch64 Windows.
-    MOZ_SANDBOX=
-    ;;
-esac
-
 MOZ_ARG_DISABLE_BOOL(sandbox,
 [  --disable-sandbox        Disable sandboxing support],
     MOZ_SANDBOX=,
     MOZ_SANDBOX=1)
 
 dnl ========================================================
 dnl = Content process sandboxing
 dnl ========================================================
--- a/security/sandbox/moz.build
+++ b/security/sandbox/moz.build
@@ -139,17 +139,17 @@ elif CONFIG['OS_ARCH'] == 'WINNT':
         'chromium/sandbox/win/src/target_services.cc',
         'chromium/sandbox/win/src/top_level_dispatcher.cc',
         'chromium/sandbox/win/src/win2k_threadpool.cc',
         'chromium/sandbox/win/src/win_utils.cc',
         'chromium/sandbox/win/src/window.cc',
         'win/SandboxInitialization.cpp',
     ]
 
-    if CONFIG['CPU_ARCH'] == 'x86_64':
+    if CONFIG['CPU_ARCH'] in ('x86_64', 'aarch64'):
         SOURCES += [
             'chromium/sandbox/win/src/interceptors_64.cc',
             'chromium/sandbox/win/src/resolver_64.cc',
             'chromium/sandbox/win/src/service_resolver_64.cc',
         ]
     else:
         SOURCES += [
             'chromium/sandbox/win/src/resolver_32.cc',