Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(269)

Unified Diff: sandbox/src/sandbox_lib.scons

Issue 11478: Finish replicating the *.vsprops structure. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/tools/tld_cleanup/tld_cleanup.scons ('k') | sandbox/tests/common/sandbox_common.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sandbox/src/sandbox_lib.scons
===================================================================
--- sandbox/src/sandbox_lib.scons (revision 5681)
+++ sandbox/src/sandbox_lib.scons (working copy)
@@ -6,29 +6,13 @@
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
],
)
« no previous file with comments | « net/tools/tld_cleanup/tld_cleanup.scons ('k') | sandbox/tests/common/sandbox_common.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698