Small cleaups to media to support disabling ozone and libvpx properly.

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 cras (ChromeOS audio) library.
     'use_cras%': 0,
     # Option e.g. for Linux distributions to link pulseaudio directly
@@ skipping 756 matching lines @@
                 'python',
                 '<(generator_path)',
                 '--platform_list=<(platform_list_txt_file)',
                 '--output_cc=<(constructor_list_cc_file)',
                 '--namespace=media',
                 '--typename=MediaOzonePlatform',
                 '--include="media/ozone/media_ozone_platform.h"'
               ],
             },
           ]
+        }, {
+          'sources!': [
+            'ozone/media_ozone_platform.cc',
+            'ozone/media_ozone_platform.h',
+          ]
         }],
         ['OS!="linux"', {
           'sources!': [
             'audio/cras/audio_manager_cras.cc',
             'audio/cras/audio_manager_cras.h',
             'audio/cras/cras_input.cc',
             'audio/cras/cras_input.h',
             'audio/cras/cras_unified.cc',
             'audio/cras/cras_unified.h',
           ],
@@ skipping 801 matching lines @@
           'type': 'none',
           'dependencies': [
             'media_java',
             'media_perftests',
           ],
           'variables': {
             'test_suite_name': 'media_perftests',
           },
           'includes': ['../build/apk_test.gypi'],
         },
-      ],
-    }],
-    ['OS=="android"', {
-      'targets': [
         {
           'target_name': 'media_android_jni_headers',
           'type': 'none',
           'sources': [
             'base/android/java/src/org/chromium/media/AudioManagerAndroid.java',
             'base/android/java/src/org/chromium/media/AudioRecordInput.java',
             'base/android/java/src/org/chromium/media/MediaCodecBridge.java',
             'base/android/java/src/org/chromium/media/MediaDrmBridge.java',
             'base/android/java/src/org/chromium/media/MediaPlayerBridge.java',
             'base/android/java/src/org/chromium/media/MediaPlayerListener.java',
@@ skipping 93 matching lines @@
     }],
     ['media_use_ffmpeg==1', {
       'targets': [
         {
           'target_name': 'ffmpeg_unittests',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
             '../base/base.gyp:test_support_base',
-            '../base/base.gyp:test_support_perf',

[scherkus (not reviewing), 2014/07/08 21:10:03]

didn't see this mentioned in the CL description -- accidental or intentional?

[awong, 2014/07/08 21:28:03]

intentional. Updated CL description.

I don't know why this is working in gyp, but including both  test_support_perf
and ffmpeg_unittests.cc ends up with 2 mains.

             '../testing/gtest.gyp:gtest',
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
             'media',
             'media_test_support',
           ],
           'sources': [
             'ffmpeg/ffmpeg_unittest.cc',
           ],
         },
         {
@@ skipping 22 matching lines @@
                   ],
                 }],
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }