Bug 1102211: Move security/sandbox/build/ into security/sandbox/chromium/ r=ted
☠☠ backed out by 60b4850423d3 ☠ ☠
authorBob Owen <bobowencode@gmail.com>
Thu, 22 Jan 2015 08:37:30 +0000
changeset 253890 4ccaf5ae9ced866e2670ec134402709283184c27
parent 253889 98a29b5792ef0bee1ca3c4272f22a49331cca9e6
child 253891 43f1f9eef449ef029ab5b2d54552e3de4203c2a6
push id721
push userjlund@mozilla.com
push dateTue, 21 Apr 2015 23:03:33 +0000
treeherdermozilla-release@d27c9211ebb3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1102211
milestone38.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 1102211: Move security/sandbox/build/ into security/sandbox/chromium/ r=ted
ipc/app/moz.build
ipc/contentproc/moz.build
security/sandbox/build/build_config.h
security/sandbox/chromium-commit-status.txt
security/sandbox/chromium/build/build_config.h
security/sandbox/linux/moz.build
security/sandbox/moz-chromium-commit-status.txt
security/sandbox/staticruntime/moz.build
security/sandbox/win/src/sandboxbroker/moz.build
--- a/ipc/app/moz.build
+++ b/ipc/app/moz.build
@@ -39,17 +39,16 @@ if CONFIG['OS_TARGET'] != 'Android':
     SOURCES += [
         '../../dom/media/gmp/GMPLoader.cpp',
     ]
 
 if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT':
     # For sandbox includes and the include dependencies those have
     LOCAL_INCLUDES += [
         '/security',
-        '/security/sandbox',
         '/security/sandbox/chromium',
     ]
     USE_LIBS += [
         'rlz',
         'sandbox_staticruntime_s',
     ]
     DELAYLOAD_DLLS += [
         'mozalloc.dll',
--- a/ipc/contentproc/moz.build
+++ b/ipc/contentproc/moz.build
@@ -19,11 +19,10 @@ if CONFIG['OS_ARCH'] == 'WINNT':
         '/toolkit/xre',
         '/xpcom/base',
     ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     # For sandbox includes and the include dependencies those have
     LOCAL_INCLUDES += [
         '/security',
-        '/security/sandbox',
         '/security/sandbox/chromium',
     ]
rename from security/sandbox/build/build_config.h
rename to security/sandbox/chromium/build/build_config.h
--- a/security/sandbox/linux/moz.build
+++ b/security/sandbox/linux/moz.build
@@ -35,17 +35,16 @@ SOURCES += [
 if '-flto' in CONFIG['OS_CXXFLAGS'] and not CONFIG['CLANG_CXX']:
     LDFLAGS += ['--param lto-partitions=1']
 
 DEFINES['NS_NO_XPCOM'] = True
 DISABLE_STL_WRAPPING = True
 
 LOCAL_INCLUDES += ['/security/sandbox/chromium/base/shim']
 LOCAL_INCLUDES += ['/security/sandbox/chromium']
-LOCAL_INCLUDES += ['/security/sandbox']
 
 if CONFIG['OS_TARGET'] != 'Android':
     # Needed for clock_gettime with glibc < 2.17:
     OS_LIBS += [
         'rt',
     ]
 
 DIRS += [
rename from security/sandbox/chromium-commit-status.txt
rename to security/sandbox/moz-chromium-commit-status.txt
--- a/security/sandbox/chromium-commit-status.txt
+++ b/security/sandbox/moz-chromium-commit-status.txt
@@ -1,7 +1,6 @@
 Chromium Commit                            Directory / File (relative to security/sandbox/)
 ----------------------------------------   ------------------------------------------------
-9522fad406dd161400daa518075828e47bd47f60   build
 9522fad406dd161400daa518075828e47bd47f60   chromium
 8e2be8d727b46e1f6f1694786dc2161b11146bd4   chromium/base/compiler_specific.h
                                            (Note: above is to keep MSVC2010 support.)
 9522fad406dd161400daa518075828e47bd47f60   win
--- a/security/sandbox/staticruntime/moz.build
+++ b/security/sandbox/staticruntime/moz.build
@@ -17,17 +17,16 @@ if CONFIG['OS_ARCH'] == 'WINNT':
         SOURCES['%s/security/sandbox/win/src/sharedmem_ipc_client.cc' % TOPSRCDIR].no_pgo = True
 
     for var in ('UNICODE', '_UNICODE', 'NS_NO_XPCOM', 'SANDBOX_EXPORTS',
                 'NOMINMAX', '_CRT_RAND_S', 'CHROMIUM_SANDBOX_BUILD'):
         DEFINES[var] = True
 
     LOCAL_INCLUDES += ['/security/sandbox/chromium/base/shim']
     LOCAL_INCLUDES += ['/security/sandbox/chromium']
-    LOCAL_INCLUDES += ['/security/sandbox']
     LOCAL_INCLUDES += ['/security']
     LOCAL_INCLUDES += ['/nsprpub']
 
     DISABLE_STL_WRAPPING = True
 
     # Suppress warnings in third-party code.
     if CONFIG['_MSC_VER']:
         CXXFLAGS += [
--- a/security/sandbox/win/src/sandboxbroker/moz.build
+++ b/security/sandbox/win/src/sandboxbroker/moz.build
@@ -20,17 +20,16 @@ EXPORTS += [
 ]
 
 for var in ('UNICODE', '_UNICODE', 'NS_NO_XPCOM', 'NOMINMAX',
             'SANDBOX_EXPORTS'):
     DEFINES[var] = True
 
 LOCAL_INCLUDES += [
     '/security',
-    '/security/sandbox',
     '/security/sandbox/chromium',
 ]
 
 DISABLE_STL_WRAPPING = True
 
 OS_LIBS += [
     'dbghelp',
 ]