summaryrefslogtreecommitdiffstats
path: root/third_party/libexif
diff options
context:
space:
mode:
authortommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-01 19:13:39 +0000
committertommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-01 19:13:39 +0000
commita6f67b466f13d4a1c980e4d0e4c44b1d408257b3 (patch)
treee416aac48299520c675b558fe5036c6f69a64b7b /third_party/libexif
parenta98c074114749b0eab6386fb66d561ad1c4de88a (diff)
downloadchromium_src-a6f67b466f13d4a1c980e4d0e4c44b1d408257b3.zip
chromium_src-a6f67b466f13d4a1c980e4d0e4c44b1d408257b3.tar.gz
chromium_src-a6f67b466f13d4a1c980e4d0e4c44b1d408257b3.tar.bz2
Media Galleries API Metadata: Image metadata
Enables libexif and uses it to parse some image tags into the GetMetadata call. BUG=318450 Review URL: https://codereview.chromium.org/191583002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260917 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libexif')
-rw-r--r--third_party/libexif/libexif.gyp43
1 files changed, 28 insertions, 15 deletions
diff --git a/third_party/libexif/libexif.gyp b/third_party/libexif/libexif.gyp
index 20aa227..5da9a1f 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
+ ],
}],
],
},