Switch from build-time to run-time flags for Project Spitzer.

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 730 matching lines @@
             'filters/ffmpeg_video_decoder.h',
           ],
           'defines': [
             'DISABLE_USER_INPUT_MONITOR',
           ],
           'conditions': [
             ['media_use_ffmpeg == 1', {
               'defines': [
                 # On Android, FFmpeg is built without video decoders. We only
                 # support hardware video decoding.
-                'ENABLE_MEDIA_PIPELINE_ON_ANDROID',
                 'DISABLE_FFMPEG_VIDEO_DECODERS',
               ],
               'direct_dependent_settings': {
                 'defines': [
-                  'ENABLE_MEDIA_PIPELINE_ON_ANDROID',
                   'DISABLE_FFMPEG_VIDEO_DECODERS',
                 ],
               },
-            }, {  # media_use_ffmpeg == 0
-              'sources!': [
-                'filters/opus_audio_decoder.cc',
-                'filters/opus_audio_decoder.h',
-              ],
             }],
           ],
         }],
         # For VaapiVideoEncodeAccelerator.
         ['target_arch != "arm" and chromeos == 1', {
           'sources': [
             'filters/h264_bitstream_buffer.cc',
             'filters/h264_bitstream_buffer.h',
           ],
         }],
@@ skipping 573 matching lines @@
           'sources!': [
             'ffmpeg/ffmpeg_common_unittest.cc',
             'filters/audio_decoder_unittest.cc',
             'filters/ffmpeg_aac_bitstream_converter_unittest.cc',
             'filters/ffmpeg_demuxer_unittest.cc',
             'filters/ffmpeg_glue_unittest.cc',
             'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
           ],
         }],
         # Even if FFmpeg is enabled on Android we don't want these.
-        # TODO(watk): Refactor tests that could be made to run on Android.
+        # TODO(watk): Refactor tests that could be made to run on Android. See
+        # http://crbug.com/570762
         ['media_use_ffmpeg==0 or OS=="android"', {
           'sources!': [
             'base/audio_video_metadata_extractor_unittest.cc',
-            'base/container_names_unittest.cc',
             'base/media_file_checker_unittest.cc',
-            'filters/audio_file_reader_unittest.cc',
-            'filters/blocking_url_protocol_unittest.cc',
             'filters/ffmpeg_video_decoder_unittest.cc',
-            'filters/in_memory_url_protocol_unittest.cc',
             'test/pipeline_integration_test.cc',
             'test/pipeline_integration_test_base.cc',
+
+            # These tests are confused by Android always having proprietary
+            # codecs enabled, but ffmpeg_branding=Chromium. These should be
+            # fixed, see http://crbug.com/570762.
+            'filters/audio_decoder_unittest.cc',
+            'filters/audio_file_reader_unittest.cc',
+            'filters/ffmpeg_demuxer_unittest.cc',
           ],
         }],
 
         ['(os_posix==1 and OS!="mac") or (OS=="win" and component!="shared_library" and win_use_allocator_shim==1)', {
           'conditions': [
             ['use_allocator!="none"', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
@@ skipping 94 matching lines @@
         'base/yuv_convert_perftest.cc',
         'test/pipeline_integration_perftest.cc',
         'test/pipeline_integration_test_base.cc',
       ],
       'conditions': [
         ['arm_neon==1', {
           'defines': [
             'USE_NEON'
           ],
         }],
+        ['OS=="android" or media_use_ffmpeg==0', {
+          # TODO(watk): Refactor tests that could be made to run on Android.
+          # See http://crbug.com/570762
+          'sources!': [
+            'base/demuxer_perftest.cc',
+            'test/pipeline_integration_perftest.cc',
+            'test/pipeline_integration_test_base.cc',
+          ],
+        }],
         ['OS=="android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
             '../ui/gl/gl.gyp:gl',
           ],
         }],
         ['media_use_ffmpeg==1', {
           'dependencies': [
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
           ],
-        }, {  # media_use_ffmpeg==0
-          'sources!': [
-            'base/demuxer_perftest.cc',
-            'test/pipeline_integration_perftest.cc',
-            'test/pipeline_integration_test_base.cc',
-          ],
         }],
       ],
     },
     {
       # GN version: //media/audio:unittests
       # For including the sources and configs in multiple test targets.
       'target_name': 'audio_test_config',
       'type': 'none',
       'direct_dependent_settings': {
         'sources': [
@@ skipping 471 matching lines @@
                 ],
                 'sources': [
                   'media_unittests_apk.isolate',
                 ],
               },
             ],
           },
         ],
       ],
     }],
-    ['media_use_ffmpeg==1', {
+    # TODO(watk): Refactor tests that could be made to run on Android. See
+    # http://crbug.com/570762
+    ['media_use_ffmpeg==1 and OS!="android"', {
       'targets': [
         {
           # GN version: //media:ffmpeg_regression_tests
           'target_name': 'ffmpeg_regression_tests',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:test_support_base',
             '../testing/gmock.gyp:gmock',
             '../testing/gtest.gyp:gtest',
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
@@ skipping 138 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }