Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1491)

Unified Diff: third_party/expat/expat.gyp

Issue 1573323002: [Chromecast] Don't use system libexpat. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/expat/expat.gyp
diff --git a/third_party/expat/expat.gyp b/third_party/expat/expat.gyp
index c11b9e65a8a4831ee2dd43f864f10602f740f5fa..142cbda2772fab0d384b520956cb495a829c455d 100644
--- a/third_party/expat/expat.gyp
+++ b/third_party/expat/expat.gyp
@@ -7,7 +7,8 @@
'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 \
wzhong 2016/01/11 21:53:34 Is '\' commonly used on gyp file?
bcf 2016/01/11 23:02:07 I just let the line be longer that 80c because tha
+ chromecast!=1', {
wzhong 2016/01/11 21:53:34 Spaces around !=.
bcf 2016/01/11 23:02:07 I removed the spaces because that seems to be more
'use_system_expat%': 1,
}, {
'use_system_expat%': 0,
@@ -66,7 +67,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', {
wzhong 2016/01/11 21:53:34 Ditto.
'defines': [
'HAVE_EXPAT_CONFIG_H',
],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698