Fix gcc 4.7 building problems - cont'

media/media.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
     # Override to dynamically link the PulseAudio library.
     'use_pulseaudio%': 0,
     # Override to dynamically link the cras (ChromeOS audio) library.
     'use_cras%': 0,
   },
+  'target_defaults': {
+     # Disable narrowing-conversion-in-initialization-list warnings.
+     'cflags+': ['-Wno-narrowing'],
+     'cflags_cc+': ['-Wno-narrowing'],

[Ami GONE FROM CHROMIUM, 2012/06/06 21:34:09]

I don't understand why you need this given the INT16_FIX changes you made.

[Han, 2012/06/06 22:18:23]

Yup, right. Reverted this file.

+  },
   'targets': [
     {
       'target_name': 'media',
       'type': '<(component)',
       'dependencies': [
         'yuv_convert',
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../crypto/crypto.gyp:crypto',
@@ skipping 587 matching lines @@
       'includes': [
         '../third_party/yasm/yasm_compile.gypi',
       ],
     },
     {
       'target_name': 'yuv_convert_simd_arm',
       'type': 'static_library',
       'include_dirs': [
         '..',
       ],
-      'sources': [
+       'sources': [

[Ami GONE FROM CHROMIUM, 2012/06/06 21:34:09]

nit: remove new space

[Han, 2012/06/06 22:18:23]

Yup, right. Reverted this file.

         'base/simd/convert_rgb_to_yuv_c.cc',
         'base/simd/convert_rgb_to_yuv.h',
         'base/simd/convert_yuv_to_rgb_c.cc',
         'base/simd/convert_yuv_to_rgb.h',
         'base/simd/filter_yuv.h',
         'base/simd/filter_yuv_c.cc',
         'base/simd/yuv_to_rgb_table.cc',
         'base/simd/yuv_to_rgb_table.h',
       ],
     },
@@ skipping 451 matching lines @@
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
           ],
           'sources': [
             'tools/media_bench/media_bench.cc',
           ],
         },
       ],
     }]
   ],
 }