Skip to content

Commit

Permalink
[Chromecast] Don't use system libexpat.
Browse files Browse the repository at this point in the history
BUG= internal b/26249831
TEST= Builds and runs.

Review URL: https://codereview.chromium.org/1573323002

Cr-Commit-Position: refs/heads/master@{#368756}
  • Loading branch information
bcf authored and Commit bot committed Jan 12, 2016
1 parent 617d1b7 commit 30b1385
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
5 changes: 4 additions & 1 deletion third_party/expat/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
}
Expand Down
4 changes: 2 additions & 2 deletions third_party/expat/expat.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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',
],
Expand Down

0 comments on commit 30b1385

Please sign in to comment.