diff options
| author | tommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 22:02:00 +0000 |
|---|---|---|
| committer | tommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 22:02:00 +0000 |
| commit | e0168050a9a73fdf7b968cf5ee0091b6059ca259 (patch) | |
| tree | 741de18e6502f2d4574ef363835ccbda940d448d /third_party/libexif | |
| parent | fba56f613d080b4416a9c10563beff231a339797 (diff) | |
| download | chromium_src-e0168050a9a73fdf7b968cf5ee0091b6059ca259.zip chromium_src-e0168050a9a73fdf7b968cf5ee0091b6059ca259.tar.gz chromium_src-e0168050a9a73fdf7b968cf5ee0091b6059ca259.tar.bz2 | |
Revert of Reapply "Media Galleries API Metadata: Image metadata" (https://codereview.chromium.org/216443005/)
Reason for revert:
Breaking Mac 10.6 release testers. (no idea why, but it is)
Original issue's description:
> Reapply "Media Galleries API Metadata: Image metadata"
>
> Original patch (also PS1) https://codereview.chromium.org/191583002
>
> CQ can't catch the breakages of this patch.
>
> TBR=
> BUG=318450
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=261864
TBR=ccameron@chromium.org,thestig@chromium.org,grt@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=318450
Review URL: https://codereview.chromium.org/225023014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261895 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libexif')
| -rw-r--r-- | third_party/libexif/libexif.gyp | 43 |
1 files changed, 15 insertions, 28 deletions
diff --git a/third_party/libexif/libexif.gyp b/third_party/libexif/libexif.gyp index 5da9a1f..20aa227 100644 --- a/third_party/libexif/libexif.gyp +++ b/third_party/libexif/libexif.gyp @@ -5,16 +5,15 @@ { 'variables': { 'conditions': [ - ['OS == "linux"', { - 'use_system_libexif%': 1, - }, { # OS != "linux" + # 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" 'use_system_libexif%': 0, }], ], }, - 'includes': [ - '../../build/util/version.gypi', - ], 'conditions': [ ['use_system_libexif==0', { 'targets': [ @@ -57,19 +56,6 @@ ], }, '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'], }], @@ -80,25 +66,26 @@ 'mac_real_dsym': 1, }, }], - ], - 'xcode_settings': { + ], + 'xcode_settings': { 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # no -fvisibility=hidden - 'DYLIB_INSTALL_NAME_BASE': '@rpath', + # TODO(kmadhusu): Copy this dylib to Versions folder. + # (Do something similar to libplugin_carbon_interpose.dylib). + 'DYLIB_INSTALL_NAME_BASE': '@executable_path/../../..', }, }], ['OS=="win"', { 'product_name': 'libexif', - 'sources': [ - 'libexif.def', - ], + 'msvs_settings': { + 'VCLinkerTool': { + 'ModuleDefinitionFile': '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 - ], }], ], }, |