Revert 260917 "Media Galleries API Metadata: Image metadata"

trunk/src/third_party/libexif/libexif.gyp

Index: trunk/src/third_party/libexif/libexif.gyp
===================================================================
--- trunk/src/third_party/libexif/libexif.gyp	(revision 260930)
+++ trunk/src/third_party/libexif/libexif.gyp	(working copy)
@@ -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
-              ],
             }],
           ],
         },