Bug 1274826 - Bypass building SandboxHooks on Gonk r=jld
authorAlexandre Lissy <lissyx@lissyx.dyndns.org>
Thu, 26 May 2016 01:02:25 +0200
changeset 340171 1743abeb235253d455700289308b125e4de75483
parent 340170 a934331fdba4ec842b74a1c4de2deedc34c0f51a
child 340172 df861a9e766d0beb9daeeb192bf5b6f4cfeb3f02
push id1183
push userraliiev@mozilla.com
push dateMon, 05 Sep 2016 20:01:49 +0000
treeherdermozilla-release@3148731bed45 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjld
bugs1274826
milestone49.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 1274826 - Bypass building SandboxHooks on Gonk r=jld MozReview-Commit-ID: 3TVdcY7aXvW
security/sandbox/linux/moz.build
--- a/security/sandbox/linux/moz.build
+++ b/security/sandbox/linux/moz.build
@@ -63,21 +63,25 @@ SOURCES += [
     '../chromium/sandbox/linux/seccomp-bpf/trap.cc',
     'broker/SandboxBrokerCommon.cpp',
     'LinuxCapabilities.cpp',
     'Sandbox.cpp',
     'SandboxBrokerClient.cpp',
     'SandboxChroot.cpp',
     'SandboxFilter.cpp',
     'SandboxFilterUtil.cpp',
-    'SandboxHooks.cpp',
     'SandboxLogging.cpp',
     'SandboxUtil.cpp',
 ]
 
+if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
+    SOURCES += [
+        'SandboxHooks.cpp',
+    ]
+
 # This copy of SafeSPrintf doesn't need to avoid the Chromium logging
 # dependency like the one in libxul does, but this way the behavior is
 # consistent.  See also the comment in SandboxLogging.h.
 SOURCES['../chromium/base/strings/safe_sprintf.cc'].flags += ['-DNDEBUG']
 
 # Keep clang from warning about intentional 'switch' fallthrough in icu_utf.cc:
 if CONFIG['CLANG_CXX']:
     SOURCES['../chromium/base/third_party/icu/icu_utf.cc'].flags += ['-Wno-implicit-fallthrough']