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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/expat/expat.gyp

Issue 8620004: Upstream: Make expat compiled in Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 b4f2cd5a9e1964e8e6bfc8f424daff04af1ec55d..89a6f904d94d9826a87523887a960f1ba9ec9a5f 100644
--- a/third_party/expat/expat.gyp
+++ b/third_party/expat/expat.gyp
@@ -15,7 +15,7 @@
]
},
'conditions': [
- ['os_posix == 1 and OS != "mac"', {
+ ['os_posix == 1 and OS != "mac" and OS != "android"', {
# On Linux, we implicitly already depend on expat via fontconfig;
# let's not pull it in twice.
'targets': [
@@ -59,7 +59,7 @@
'COMPILED_FROM_DSP',
],
}],
- ['OS=="mac" or OS=="freebsd" or OS=="openbsd"', {
+ ['OS=="mac" or OS=="android" or OS=="freebsd" or OS=="openbsd"', {
'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