Index: third_party/libexif/libexif.gyp |
diff --git a/third_party/libexif/libexif.gyp b/third_party/libexif/libexif.gyp |
index 20aa2271ebdde7eccddd3df903f9dcac5fe2602f..ba6f1d237ea284992c0b8dfdf47355ac340cf056 100644 |
--- a/third_party/libexif/libexif.gyp |
+++ b/third_party/libexif/libexif.gyp |
@@ -5,11 +5,9 @@ |
{ |
'variables': { |
'conditions': [ |
- # TODO(kmadhusu): We are not ready to build this library on Android. |
- # Resolve the issues and build on Android. |
- ['os_posix==1 and OS!="mac"', { |
- 'use_system_libexif%': 0, |
- }, { # os_posix != 1 or OS == "mac" |
+ ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { |
Lei Zhang
2014/03/12 22:49:46
Maybe just do: OS == Linux ?
tommycli
2014/03/12 23:27:21
Works with me. What's the situation with ChromeOS
|
+ 'use_system_libexif%': 1, |
+ }, { # os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" |
'use_system_libexif%': 0, |
}], |
], |
@@ -56,6 +54,9 @@ |
], |
}, |
'conditions': [ |
+ ['clang==1', { |
+ 'cflags': ['-Wno-enum-conversion', '-Wno-switch'], |
+ }], |
['os_posix==1 and OS!="mac"', { |
'cflags!': ['-fvisibility=hidden'], |
}], |