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: http://src.chromium.org/svn/trunk/src/build@10882 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
90e410d267
Коммит
f30559117d
|
@ -192,12 +192,12 @@ components = []
|
||||||
sconscript_map = dict(
|
sconscript_map = dict(
|
||||||
base = '$BASE_DIR/base_main${_GYP}.scons',
|
base = '$BASE_DIR/base_main${_GYP}.scons',
|
||||||
breakpad = '$BREAKPAD_DIR/SConscript',
|
breakpad = '$BREAKPAD_DIR/SConscript',
|
||||||
chrome = '$CHROME_DIR/chrome.scons',
|
chrome = '$CHROME_DIR/chrome_main${_GYP}.scons',
|
||||||
gears = '$GEARS_DIR/SConscript',
|
gears = '$GEARS_DIR/SConscript',
|
||||||
google_update = '$GOOGLE_UPDATE_DIR/SConscript',
|
google_update = '$GOOGLE_UPDATE_DIR/SConscript',
|
||||||
googleurl = '$GOOGLEURL_DIR/googleurl.scons',
|
googleurl = '$GOOGLEURL_DIR/googleurl.scons',
|
||||||
media = '$MEDIA_DIR/media.scons',
|
media = '$MEDIA_DIR/media.scons',
|
||||||
net = '$NET_DIR/net.scons',
|
net = '$NET_DIR/net_main${_GYP}.scons',
|
||||||
printing = '$PRINTING_DIR/printing.scons',
|
printing = '$PRINTING_DIR/printing.scons',
|
||||||
rlz = '$RLZ_DIR/SConscript',
|
rlz = '$RLZ_DIR/SConscript',
|
||||||
sandbox = '$SANDBOX_DIR/sandbox.scons',
|
sandbox = '$SANDBOX_DIR/sandbox.scons',
|
||||||
|
@ -219,7 +219,7 @@ sconscript_map = dict(
|
||||||
],
|
],
|
||||||
tools = '$GTK_CLIP_DUMP_DIR/gcd.scons',
|
tools = '$GTK_CLIP_DUMP_DIR/gcd.scons',
|
||||||
v8 = '$OBJ_ROOT/build/SConscript.v8',
|
v8 = '$OBJ_ROOT/build/SConscript.v8',
|
||||||
webkit = '$WEBKIT_DIR/webkit.scons',
|
webkit = '$WEBKIT_DIR/webkit_main${_GYP}.scons',
|
||||||
)
|
)
|
||||||
|
|
||||||
if root_env.get('_GYP'):
|
if root_env.get('_GYP'):
|
||||||
|
@ -641,7 +641,7 @@ mac_env.FilterOut(
|
||||||
'$BREAKPAD_DIR/SConscript',
|
'$BREAKPAD_DIR/SConscript',
|
||||||
'$BSDIFF_DIR/bsdiff.scons',
|
'$BSDIFF_DIR/bsdiff.scons',
|
||||||
'$BSPATCH_DIR/bspatch.scons',
|
'$BSPATCH_DIR/bspatch.scons',
|
||||||
'$CHROME_DIR/chrome.scons',
|
'$CHROME_DIR/chrome_main${_GYP}.scons',
|
||||||
'$GOOGLE_UPDATE_DIR/SConscript',
|
'$GOOGLE_UPDATE_DIR/SConscript',
|
||||||
'$LIBJPEG_DIR/libjpeg.scons',
|
'$LIBJPEG_DIR/libjpeg.scons',
|
||||||
'$LIBXML_DIR/libxml.scons',
|
'$LIBXML_DIR/libxml.scons',
|
||||||
|
|
Загрузка…
Ссылка в новой задаче