diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-04 07:24:51 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-04 07:24:51 +0000 |
| commit | 347dd2b946fae0f44cfed97b9fa7cf456cd623a4 (patch) | |
| tree | 9eddb3cf68702aa408a34a54289d6a4b993cf663 /build | |
| parent | 4119ac8f30cda71888d7ca437deafc4488cf9cf8 (diff) | |
| download | chromium_src-347dd2b946fae0f44cfed97b9fa7cf456cd623a4.zip chromium_src-347dd2b946fae0f44cfed97b9fa7cf456cd623a4.tar.gz chromium_src-347dd2b946fae0f44cfed97b9fa7cf456cd623a4.tar.bz2 | |
Move the main entry point *.scons files in the key remaining components
(net, webkit, chrome) to *_main.scons, so we can use GYP=1 on the command
line to switch between old and new while tracking down the remaining
inconsistencies.
Review URL: http://codereview.chromium.org/39080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10882 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/SConscript.main | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index 60c4df0..97b6701 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -192,12 +192,12 @@ components = [] sconscript_map = dict( base = '$BASE_DIR/base_main${_GYP}.scons', breakpad = '$BREAKPAD_DIR/SConscript', - chrome = '$CHROME_DIR/chrome.scons', + chrome = '$CHROME_DIR/chrome_main${_GYP}.scons', gears = '$GEARS_DIR/SConscript', google_update = '$GOOGLE_UPDATE_DIR/SConscript', googleurl = '$GOOGLEURL_DIR/googleurl.scons', media = '$MEDIA_DIR/media.scons', - net = '$NET_DIR/net.scons', + net = '$NET_DIR/net_main${_GYP}.scons', printing = '$PRINTING_DIR/printing.scons', rlz = '$RLZ_DIR/SConscript', sandbox = '$SANDBOX_DIR/sandbox.scons', @@ -219,7 +219,7 @@ sconscript_map = dict( ], tools = '$GTK_CLIP_DUMP_DIR/gcd.scons', v8 = '$OBJ_ROOT/build/SConscript.v8', - webkit = '$WEBKIT_DIR/webkit.scons', + webkit = '$WEBKIT_DIR/webkit_main${_GYP}.scons', ) if root_env.get('_GYP'): @@ -641,7 +641,7 @@ mac_env.FilterOut( '$BREAKPAD_DIR/SConscript', '$BSDIFF_DIR/bsdiff.scons', '$BSPATCH_DIR/bspatch.scons', - '$CHROME_DIR/chrome.scons', + '$CHROME_DIR/chrome_main${_GYP}.scons', '$GOOGLE_UPDATE_DIR/SConscript', '$LIBJPEG_DIR/libjpeg.scons', '$LIBXML_DIR/libxml.scons', |