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

media/media.gyp

Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 5b52d86c228ce866c9459f4a3b754ad786999780..bac058f08d35060aee58dad56d8dddad14896cbe 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -774,6 +774,11 @@
               ],
             },
           ]
+        }, {
+          'sources!': [
+            'ozone/media_ozone_platform.cc',
+            'ozone/media_ozone_platform.h',
+          ]
         }],
         ['OS!="linux"', {
           'sources!': [
@@ -1595,10 +1600,6 @@
           },
           'includes': ['../build/apk_test.gypi'],
         },
-      ],
-    }],
-    ['OS=="android"', {
-      'targets': [
         {
           'target_name': 'media_android_jni_headers',
           'type': 'none',
@@ -1712,7 +1713,6 @@
             '../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',