summaryrefslogtreecommitdiffstats
path: root/sandbox/src/sandbox_lib.scons
diff options
context:
space:
mode:
Diffstat (limited to 'sandbox/src/sandbox_lib.scons')
-rw-r--r--sandbox/src/sandbox_lib.scons20
1 files changed, 2 insertions, 18 deletions
diff --git a/sandbox/src/sandbox_lib.scons b/sandbox/src/sandbox_lib.scons
index 4232ff8..493f3be 100644
--- a/sandbox/src/sandbox_lib.scons
+++ b/sandbox/src/sandbox_lib.scons
@@ -6,29 +6,13 @@ Import('env')
env = env.Clone()
-env.SConscript([
+env.ApplySConscript([
'$GTEST_DIR/../using_gtest.scons',
-], {'env':env})
-
-# Some of the sandbox sources include "gtest.h", so we need it
-# in the base env here, not just in env_tests.
-env.Prepend(
- CPPPATH = [
- '$CHROME_SRC_DIR',
- ],
- CPPDEFINES = [
- 'CHROMIUM_BUILD',
- ],
-)
+])
if env['PLATFORM'] == 'win32':
env.Append(
- CPPDEFINES = [
- '_SECURE_ATL',
- '_WINDOWS',
- ],
CCFLAGS = [
- '/TP',
'/WX', # treat warnings as errors
],
)