diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-09 19:54:38 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-09 19:54:38 +0000 |
| commit | a9f6af38e95788a7753a1840f2e0fc21ee53bf97 (patch) | |
| tree | 0a36a73ee3ed2267f4ed815d173c90f676c5d590 | |
| parent | 1d535e44d2328fb7e56a0bdd0c09ed5a7705a1c7 (diff) | |
| download | chromium_src-a9f6af38e95788a7753a1840f2e0fc21ee53bf97.zip chromium_src-a9f6af38e95788a7753a1840f2e0fc21ee53bf97.tar.gz chromium_src-a9f6af38e95788a7753a1840f2e0fc21ee53bf97.tar.bz2 | |
Merge 199050 "Miscellaneous fixes for system libraries files:"
> Miscellaneous fixes for system libraries files:
>
> - fix icu namespace ambiguity
> - fix undeclared variable in libvpx.gyp file
> - add gyp target for chromium zip code in the third_party directory
>
> BUG=226860
> R=rsleevi@chromium.org
>
> Review URL: https://codereview.chromium.org/15073003
BUG=239560
TBR=phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/14698012
git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@199259 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/linux/unbundle/icu.gyp | 5 | ||||
| -rw-r--r-- | build/linux/unbundle/libvpx.gyp | 2 | ||||
| -rw-r--r-- | build/linux/unbundle/zlib.gyp | 21 |
3 files changed, 26 insertions, 2 deletions
diff --git a/build/linux/unbundle/icu.gyp b/build/linux/unbundle/icu.gyp index 4b81277..2016ccb 100644 --- a/build/linux/unbundle/icu.gyp +++ b/build/linux/unbundle/icu.gyp @@ -7,6 +7,11 @@ { 'target_name': 'system_icu', 'type': 'none', + 'direct_dependent_settings': { + 'defines': [ + 'U_USING_ICU_NAMESPACE=0', + ], + }, 'link_settings': { 'ldflags': [ '<!@(icu-config --ldflags)', diff --git a/build/linux/unbundle/libvpx.gyp b/build/linux/unbundle/libvpx.gyp index ada83ee..cdcf6fa 100644 --- a/build/linux/unbundle/libvpx.gyp +++ b/build/linux/unbundle/libvpx.gyp @@ -12,7 +12,7 @@ ], }, 'variables': { - 'headers_root_path': '<(libvpx_source)', + 'headers_root_path': 'source/libvpx', 'header_filenames': [ 'vpx/vpx_codec_impl_bottom.h', 'vpx/vpx_image.h', diff --git a/build/linux/unbundle/zlib.gyp b/build/linux/unbundle/zlib.gyp index 3992e2d..0a85ff0 100644 --- a/build/linux/unbundle/zlib.gyp +++ b/build/linux/unbundle/zlib.gyp @@ -43,6 +43,25 @@ '-lminizip', ], }, - } + }, + { + 'target_name': 'zip', + 'type': 'static_library', + 'dependencies': [ + 'minizip', + '../../base/base.gyp:base', + ], + 'include_dirs': [ + '../..', + ], + 'sources': [ + 'google/zip.cc', + 'google/zip.h', + 'google/zip_internal.cc', + 'google/zip_internal.h', + 'google/zip_reader.cc', + 'google/zip_reader.h', + ], + }, ], } |