| OLD | NEW |
| 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 Import('env') | 5 Import('env') |
| 6 | 6 |
| 7 env = env.Clone() | 7 env = env.Clone() |
| 8 | 8 |
| 9 env.SConscript([ | 9 env.ApplySConscript([ |
| 10 '$BASE_DIR/using_base.scons', | 10 '$BASE_DIR/using_base.scons', |
| 11 '$GTEST_DIR/../using_gtest.scons', | 11 '$GTEST_DIR/../using_gtest.scons', |
| 12 '$SANDBOX_DIR/using_sandbox.scons', | 12 '$SANDBOX_DIR/using_sandbox.scons', |
| 13 ], {'env':env}) | 13 ]) |
| 14 | |
| 15 env.Prepend( | |
| 16 CPPPATH = [ | |
| 17 '$CHROME_SRC_DIR', | |
| 18 ], | |
| 19 CPPDEFINES = [ | |
| 20 'CHROMIUM_BUILD', | |
| 21 ], | |
| 22 ) | |
| 23 | 14 |
| 24 if env['PLATFORM'] == 'win32': | 15 if env['PLATFORM'] == 'win32': |
| 25 env.Append( | 16 env.Append( |
| 26 CPPDEFINES = [ | |
| 27 '_SECURE_ATL', | |
| 28 '_WINDOWS', | |
| 29 ], | |
| 30 CCFLAGS = [ | 17 CCFLAGS = [ |
| 31 '/TP', | |
| 32 '/WX', # treat warnings as errors | 18 '/WX', # treat warnings as errors |
| 33 ], | 19 ], |
| 34 ) | 20 ) |
| 35 | 21 |
| 36 env.Prepend( | |
| 37 LINKFLAGS = [ | |
| 38 '/DELAYLOAD:dwmapi.dll', | |
| 39 '/DELAYLOAD:uxtheme.dll', | |
| 40 '/MACHINE:X86', | |
| 41 '/FIXED:No', | |
| 42 '/safeseh', | |
| 43 '/dynamicbase', | |
| 44 '/ignore:4199', | |
| 45 '/nxcompat', | |
| 46 ], | |
| 47 ) | |
| 48 | |
| 49 | |
| 50 | |
| 51 # TODO(bradnelson): This step generates integration_tests.pch.ib_tag | 22 # TODO(bradnelson): This step generates integration_tests.pch.ib_tag |
| 52 # SCons doesn't know. | 23 # SCons doesn't know. |
| 53 env_p = env.Clone() | 24 env_p = env.Clone() |
| 54 pch, obj = env_p.PCH(['integration_tests.pch', 'integration_tests.obj'], | 25 pch, obj = env_p.PCH(['integration_tests.pch', 'integration_tests.obj'], |
| 55 'integration_tests.cc') | 26 'integration_tests.cc') |
| 56 env['PCH'] = pch | 27 env['PCH'] = pch |
| 57 env['PCHSTOP'] = 'stdafx.h' | 28 env['PCHSTOP'] = 'stdafx.h' |
| 58 env.Append(CCPCHFLAGS = ['/FIstdafx.h']) | 29 env.Append(CCPCHFLAGS = ['/FIstdafx.h']) |
| 59 | 30 |
| 60 | 31 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 71 '$SANDBOX_DIR/src/process_policy_test.cc', | 42 '$SANDBOX_DIR/src/process_policy_test.cc', |
| 72 '$SANDBOX_DIR/src/registry_policy_test.cc', | 43 '$SANDBOX_DIR/src/registry_policy_test.cc', |
| 73 '$SANDBOX_DIR/src/sync_policy_test.cc', | 44 '$SANDBOX_DIR/src/sync_policy_test.cc', |
| 74 '$SANDBOX_DIR/src/unload_dll_test.cc', | 45 '$SANDBOX_DIR/src/unload_dll_test.cc', |
| 75 | 46 |
| 76 '../common/controller$OBJSUFFIX', | 47 '../common/controller$OBJSUFFIX', |
| 77 ] | 48 ] |
| 78 | 49 |
| 79 env.ChromeTestProgram('sbox_integration_tests', input_files, | 50 env.ChromeTestProgram('sbox_integration_tests', input_files, |
| 80 COMPONENT_PLATFORM_SETUP=None) | 51 COMPONENT_PLATFORM_SETUP=None) |
| OLD | NEW |