diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-06 22:06:40 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-06 22:06:40 +0000 |
| commit | d8e70b4ea21e505f0e784fdef8f7c36ab619d7d8 (patch) | |
| tree | a16c6e4802f3a1395a231f14373ceaa7a83bbe74 /webkit/SConscript | |
| parent | a6edba920d9428f580007e8ea4d8b28c4ea98c06 (diff) | |
| download | chromium_src-d8e70b4ea21e505f0e784fdef8f7c36ab619d7d8.zip chromium_src-d8e70b4ea21e505f0e784fdef8f7c36ab619d7d8.tar.gz chromium_src-d8e70b4ea21e505f0e784fdef8f7c36ab619d7d8.tar.bz2 | |
More efficient webkit addRepository() mapping.
Get rid of some unnecessary addRepository() calls that mapped specific
webkit\port\ subdirectories to third_party\WebKit\WebCore subdirectories,
in ways that were already covered by the mapping in webkit\SConscript of
all of $WEBKIT_DIR\port to third_party\WebKit\WebCore.
This takes about 40 duplicate /I options out of a typical compilation
command line (and, more importantly, out of the .h file searches).
Add additional comments about future potential efficiency that we
can get from eliminating the quirky way we remap specific directories
into webkit\port, instead of just maintaining a completely parallel
directory structure and mapping the whole tree once.
Review URL: http://codereview.chromium.org/9466
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/SConscript')
| -rw-r--r-- | webkit/SConscript | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/webkit/SConscript b/webkit/SConscript index 8fa2049..72cf78b 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -21,7 +21,7 @@ env_res = env.Clone() # # webkit/Hammer/port/ # webkit/port/ -# third_party/WebKit/WebCore +# third_party/WebKit/WebCore/ # # SCons will replicate the compiler and linker -I and -L options so # that the tools will find the right .h and library files. This comes @@ -29,6 +29,13 @@ env_res = env.Clone() # line, but with the benefit that the build should "just work" # regardless of which tree the file lives in, and regardless of whether # or not the file involved is a generated file or checked-in source. +# +# (Note that because the build/SConscript.main file also calls +# addRepository() for the entire $OBJ_ROOT tree, that adds an +# extra -I or -L option for the webkit/port/ subdirectory, after the +# third_party/WebKit/WebCore/ in the above list. We'd like to +# eliminate that in the future, but that will require some +# deeper magic, and maybe a SCons modification.) port_dir = env.Dir('$WEBKIT_DIR/port') port_dir.addRepository(env.Dir('$CHROME_SRC_DIR/webkit/port')) |