Index: third_party/libexif/libexif.gyp |
diff --git a/third_party/libexif/libexif.gyp b/third_party/libexif/libexif.gyp |
index 20aa2271ebdde7eccddd3df903f9dcac5fe2602f..5da9a1f5a9e718be53c1f619f9f7ac404ba810be 100644 |
--- a/third_party/libexif/libexif.gyp |
+++ b/third_party/libexif/libexif.gyp |
@@ -5,15 +5,16 @@ |
{ |
'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 == "linux"', { |
+ 'use_system_libexif%': 1, |
+ }, { # OS != "linux" |
'use_system_libexif%': 0, |
}], |
], |
}, |
+ 'includes': [ |
+ '../../build/util/version.gypi', |
+ ], |
'conditions': [ |
['use_system_libexif==0', { |
'targets': [ |
@@ -56,6 +57,19 @@ |
], |
}, |
'conditions': [ |
+ ['clang==1', { |
+ 'cflags': [ |
+ '-Wno-enum-conversion', |
+ '-Wno-switch' |
+ ], |
+ 'xcode_settings': { |
+ 'WARNING_CFLAGS': [ |
+ '-Wno-enum-conversion', |
+ '-Wno-switch', |
+ '-Wno-format', |
+ ], |
+ }, |
+ }], |
['os_posix==1 and OS!="mac"', { |
'cflags!': ['-fvisibility=hidden'], |
}], |
@@ -66,26 +80,25 @@ |
'mac_real_dsym': 1, |
}, |
}], |
- ], |
- 'xcode_settings': { |
+ ], |
+ 'xcode_settings': { |
'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # no -fvisibility=hidden |
- # TODO(kmadhusu): Copy this dylib to Versions folder. |
- # (Do something similar to libplugin_carbon_interpose.dylib). |
- 'DYLIB_INSTALL_NAME_BASE': '@executable_path/../../..', |
+ 'DYLIB_INSTALL_NAME_BASE': '@rpath', |
}, |
}], |
['OS=="win"', { |
'product_name': 'libexif', |
- 'msvs_settings': { |
- 'VCLinkerTool': { |
- 'ModuleDefinitionFile': 'libexif.def', |
- }, |
- }, |
+ 'sources': [ |
+ 'libexif.def', |
+ ], |
'defines': [ |
# This seems like a hack, but this is what WebKit Win does. |
'snprintf=_snprintf', |
'inline=__inline', |
], |
+ 'msvs_disabled_warnings': [ |
+ 4267, # size_t -> ExifLong truncation on amd64 |
+ ], |
}], |
], |
}, |