make sure we don't include the obsolete 2008 SDK dir....

make sure we don't include the obsolete 2008 SDK dir.

This is making the nacl 64 app to fail to build, because our code
to make sure we use the lib64 folder fails because it does not except
to have the sdk Lib dir twice (once for 2008, once for win7).


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=40379

[Nicolas Sylvain, 2010-03-01 22:44:38]

gsearch failed me.  The path was also added in a native_client gyp file.

My change is still valid though, we need to be able to remove the 2008 dir
so we don't have this kind of problem again.

Nicolas


On Mon, Mar 1, 2010 at 2:34 PM, <nsylvain@chromium.org> wrote:

> Reviewers: Marc-Antoine Ruel, bradnelson, gregoryd,
>
> Description:
> make sure we don't include the obsolete 2008 SDK dir.
>
> This is making the nacl 64 app to fail to build, because our code
> to make sure we use the lib64 folder fails because it does not except
> to have the sdk Lib dir twice (once for 2008, once for win7).
>
>
> Please review this at http://codereview.chromium.org/660314
>
> SVN Base: svn://chrome-svn/chrome/trunk/src/
>
> Affected files:
>  M     base/allocator/allocator.gyp
>  M     third_party/libjingle/libjingle.gyp
>  M     third_party/tcmalloc/tcmalloc.gyp
>
>
> Index: third_party/libjingle/libjingle.gyp
> ===================================================================
> --- third_party/libjingle/libjingle.gyp (revision 40307)
> +++ third_party/libjingle/libjingle.gyp (working copy)
> @@ -38,7 +38,7 @@
>     'conditions': [
>       ['OS=="win"', {
>         'include_dirs': [
> -          '../third_party/platformsdk_win2008_6_1/files/Include',
> +          '../third_party/platformsdk_win7/files/Include',
>         ],
>       }],
>       ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd"', {
> Index: third_party/tcmalloc/tcmalloc.gyp
> ===================================================================
> --- third_party/tcmalloc/tcmalloc.gyp   (revision 40307)
> +++ third_party/tcmalloc/tcmalloc.gyp   (working copy)
> @@ -143,7 +143,7 @@
>         'VCLibrarianTool=': {
>           'AdditionalOptions': ['/ignore:4006,4221'],
>           'AdditionalLibraryDirectories':
> -            ['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib'],
> +            ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'],
>         },
>         'VCLinkerTool': {
>           'AdditionalOptions': ['/ignore:4006'],
> Index: base/allocator/allocator.gyp
> ===================================================================
> --- base/allocator/allocator.gyp        (revision 40309)
> +++ base/allocator/allocator.gyp        (working copy)
> @@ -254,7 +254,7 @@
>         'VCLibrarianTool=': {
>           'AdditionalOptions': ['/ignore:4006,4221'],
>           'AdditionalLibraryDirectories':
> -            ['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib'],
> +            ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'],
>         },
>         'VCLinkerTool': {
>           'AdditionalOptions': ['/ignore:4006'],
>
>
>

[gregoryd, 2010-03-01 22:45:46]

LGTM
I am working on a similar CL for NaCl

[M-A Ruel, 2010-03-01 23:28:08]

lgtm