diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-03 01:24:31 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-03 01:24:31 +0200 |
| commit | 4613b91ecac2745252c40be64e73de5ff920b02b (patch) | |
| tree | 26b0aa50bb4d580b156ab2eb9825707a17f51e99 /ipc/app | |
| parent | e1490c07e29f5e4715f73088b7ca7aab4ada90a6 (diff) | |
| download | UXP-4613b91ecac2745252c40be64e73de5ff920b02b.tar UXP-4613b91ecac2745252c40be64e73de5ff920b02b.tar.gz UXP-4613b91ecac2745252c40be64e73de5ff920b02b.tar.lz UXP-4613b91ecac2745252c40be64e73de5ff920b02b.tar.xz UXP-4613b91ecac2745252c40be64e73de5ff920b02b.zip | |
Remove sandbox ductwork conditional code.
Diffstat (limited to 'ipc/app')
| -rw-r--r-- | ipc/app/moz.build | 37 | ||||
| -rw-r--r-- | ipc/app/pie/moz.build | 11 |
2 files changed, 0 insertions, 48 deletions
diff --git a/ipc/app/moz.build b/ipc/app/moz.build index 55c338cb8..a5bf66737 100644 --- a/ipc/app/moz.build +++ b/ipc/app/moz.build @@ -43,47 +43,10 @@ if CONFIG['OS_ARCH'] == 'WINNT': 'nss3.dll', ] - if CONFIG['MOZ_SANDBOX']: - # For sandbox includes and the include dependencies those have - LOCAL_INCLUDES += [ - '/security/sandbox/chromium', - '/security/sandbox/chromium-shim', - ] - - USE_LIBS += [ - 'sandbox_s', - ] - - DELAYLOAD_DLLS += [ - 'winmm.dll', - 'user32.dll', - ] - DELAYLOAD_DLLS += [ 'xul.dll', ] -if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_TARGET'] in ('Linux', 'Android'): - USE_LIBS += [ - 'mozsandbox', - ] - - # gcc lto likes to put the top level asm in syscall.cc in a different partition - # from the function using it which breaks the build. Work around that by - # forcing there to be only one partition. - if '-flto' in CONFIG['OS_CXXFLAGS'] and not CONFIG['CLANG_CXX']: - LDFLAGS += ['--param lto-partitions=1'] - -if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_TARGET'] == 'Darwin': - # For sandbox includes and the include dependencies those have - LOCAL_INCLUDES += [ - '/security/sandbox/chromium', - '/security/sandbox/chromium-shim', - ] - USE_LIBS += [ - 'mozsandbox', - ] - if CONFIG['_MSC_VER']: # Always enter a Windows program through wmain, whether or not we're # a console application. diff --git a/ipc/app/pie/moz.build b/ipc/app/pie/moz.build index 0247b25b4..6924199b5 100644 --- a/ipc/app/pie/moz.build +++ b/ipc/app/pie/moz.build @@ -16,15 +16,4 @@ LOCAL_INCLUDES += [ '/xpcom/base', ] -if CONFIG['MOZ_SANDBOX']: - USE_LIBS += [ - 'mozsandbox', - ] - - # gcc lto likes to put the top level asm in syscall.cc in a different partition - # from the function using it which breaks the build. Work around that by - # forcing there to be only one partition. - if '-flto' in CONFIG['OS_CXXFLAGS'] and not CONFIG['CLANG_CXX']: - LDFLAGS += ['--param lto-partitions=1'] - LDFLAGS += ['-pie'] |