diff options
| author | bcf <bcf@chromium.org> | 2016-01-11 17:24:48 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-12 01:26:06 +0000 |
| commit | 30b1385e4732ff1d1a01073a814284b557f25833 (patch) | |
| tree | 2138391dedde53838ad6c06d53f6c978e8a9aa1a /third_party/expat | |
| parent | 617d1b737d128c9b210cf446ca274fd5c24aec1e (diff) | |
| download | chromium_src-30b1385e4732ff1d1a01073a814284b557f25833.zip chromium_src-30b1385e4732ff1d1a01073a814284b557f25833.tar.gz chromium_src-30b1385e4732ff1d1a01073a814284b557f25833.tar.bz2 | |
[Chromecast] Don't use system libexpat.
BUG= internal b/26249831
TEST= Builds and runs.
Review URL: https://codereview.chromium.org/1573323002
Cr-Commit-Position: refs/heads/master@{#368756}
Diffstat (limited to 'third_party/expat')
| -rw-r--r-- | third_party/expat/BUILD.gn | 5 | ||||
| -rw-r--r-- | third_party/expat/expat.gyp | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/third_party/expat/BUILD.gn b/third_party/expat/BUILD.gn index 78ddb05..533296e 100644 --- a/third_party/expat/BUILD.gn +++ b/third_party/expat/BUILD.gn @@ -2,7 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -if (is_linux) { +import("//build/config/chromecast_build.gni") + +# Chromecast doesn't ship expat as a system library +if (is_linux && !is_chromecast) { config("expat_config") { libs = [ "expat" ] } diff --git a/third_party/expat/expat.gyp b/third_party/expat/expat.gyp index c11b9e6..145e748 100644 --- a/third_party/expat/expat.gyp +++ b/third_party/expat/expat.gyp @@ -7,7 +7,7 @@ 'conditions': [ # On Linux, we implicitly already depend on expat via fontconfig; # let's not pull it in twice. - ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { + ['os_posix==1 and OS!="mac" and OS!="ios" and OS!="android" and chromecast!=1', { 'use_system_expat%': 1, }, { 'use_system_expat%': 0, @@ -66,7 +66,7 @@ 'COMPILED_FROM_DSP', ], }], - ['OS=="mac" or OS=="ios" or OS=="android" or os_bsd==1', { + ['OS=="mac" or OS=="ios" or OS=="android" or os_bsd==1 or chromecast==1', { 'defines': [ 'HAVE_EXPAT_CONFIG_H', ], |