diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-10 07:56:30 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-10 07:56:30 +0000 |
| commit | 291d16835e6c0512b701107ae49093f96a16ac7f (patch) | |
| tree | f4eb4036760268ea904359e217b2ee4bcca266f6 | |
| parent | e8da8f73464def0ebf6114da197639479535a5ad (diff) | |
| download | chromium_src-291d16835e6c0512b701107ae49093f96a16ac7f.zip chromium_src-291d16835e6c0512b701107ae49093f96a16ac7f.tar.gz chromium_src-291d16835e6c0512b701107ae49093f96a16ac7f.tar.bz2 | |
fix linux build
By fixing other places where we tried to include libxml/scons but it is now libxml/DerivedSources.
TBR=sgk
Review URL: http://codereview.chromium.org/7071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3205 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/SConscript | 1 | ||||
| -rw-r--r-- | chrome/SConscript.automated_ui_tests | 2 | ||||
| -rw-r--r-- | chrome/SConscript.ui_tests | 2 | ||||
| -rw-r--r-- | chrome/SConscript.unit_tests | 2 | ||||
| -rw-r--r-- | chrome/browser/SConscript | 2 | ||||
| -rw-r--r-- | chrome/common/SConscript | 2 | ||||
| -rw-r--r-- | third_party/libxslt/SConscript | 2 |
7 files changed, 7 insertions, 6 deletions
diff --git a/chrome/SConscript b/chrome/SConscript index 69554d8..a23b126 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -93,6 +93,7 @@ env_dll.Append( '$SKIA_DIR/include/corecg', '$SKIA_DIR/platform', '$LIBXSL_DIR', + '$LIBXML_DIR/DerivedSources/include', '$LIBXML_DIR/include', '$BREAKPAD_DIR/src', ], diff --git a/chrome/SConscript.automated_ui_tests b/chrome/SConscript.automated_ui_tests index db35988..8d2629c 100644 --- a/chrome/SConscript.automated_ui_tests +++ b/chrome/SConscript.automated_ui_tests @@ -11,7 +11,7 @@ env_test.Prepend( '$ICU38_DIR/public/common', '$ICU38_DIR/public/i18n', '$LIBXML_DIR/include', - '$LIBXML_DIR/scons/include', + '$LIBXML_DIR/DerivedSources/include', '$SKIA_DIR/include', '$SKIA_DIR/include/corecg', '$SKIA_DIR/platform', diff --git a/chrome/SConscript.ui_tests b/chrome/SConscript.ui_tests index 6123448..6d8da76 100644 --- a/chrome/SConscript.ui_tests +++ b/chrome/SConscript.ui_tests @@ -19,7 +19,7 @@ env_test.Prepend( 'third_party/wtl/include', '$LIBXSLT_DIR', '$LIBXML_DIR/include', - '$LIBXML_DIR/scons/include', + '$LIBXML_DIR/DerivedSources/include', 'tools/build/win', ], CPPDEFINES = [ diff --git a/chrome/SConscript.unit_tests b/chrome/SConscript.unit_tests index 30ee76a..053787e 100644 --- a/chrome/SConscript.unit_tests +++ b/chrome/SConscript.unit_tests @@ -18,7 +18,7 @@ env_test.Prepend( '$ICU38_DIR/public/common', '$ICU38_DIR/public/i18n', '$LIBXML_DIR/include', - '$LIBXML_DIR/scons/include', + '$LIBXML_DIR/DerivedSources/include', '$SKIA_DIR/include', '$SKIA_DIR/include/corecg', '$SKIA_DIR/platform', diff --git a/chrome/browser/SConscript b/chrome/browser/SConscript index 5c88bb8..6401e45 100644 --- a/chrome/browser/SConscript +++ b/chrome/browser/SConscript @@ -40,7 +40,7 @@ env.Append( '$CHROME_DIR/third_party/hunspell/src/hunspell', '$CHROME_DIR/third_party/wtl/include', '$NPAPI_DIR', - '$LIBXML_DIR/scons/include', + '$LIBXML_DIR/DerivedSources/include', '$LIBXML_DIR/include', '$ICU38_DIR/public/common', '$ICU38_DIR/public/i18n', diff --git a/chrome/common/SConscript b/chrome/common/SConscript index 24bf254..5b8c414 100644 --- a/chrome/common/SConscript +++ b/chrome/common/SConscript @@ -28,7 +28,7 @@ env.Append( CPPPATH = [ 'third_party/wtl/include', '$NPAPI_DIR', - '$LIBXML_DIR/scons/include', + '$LIBXML_DIR/DerivedSources/include', '$LIBXML_DIR/include', 'app', diff --git a/third_party/libxslt/SConscript b/third_party/libxslt/SConscript index dbf2c91..d28fb75 100644 --- a/third_party/libxslt/SConscript +++ b/third_party/libxslt/SConscript @@ -33,7 +33,7 @@ env = env.Clone() env.Prepend( CPPPATH = [ - '$LIBXML_DIR/scons/include', + '$LIBXML_DIR/DerivedSources/include', '$LIBXML_DIR/include', '$ICU38_DIR/public/common', '$ICU38_DIR/public/18n', |