MediaStreamRecorder: enable in Android (including linking libwebm)

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 40 matching lines @@
       # GN version: //media
       'target_name': 'media',
       'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../crypto/crypto.gyp:crypto',
         '../gpu/gpu.gyp:command_buffer_common',
         '../skia/skia.gyp:skia',
+        '../third_party/libwebm/libwebm.gyp:libwebm',
         '../third_party/libyuv/libyuv.gyp:libyuv',
         '../third_party/opus/opus.gyp:opus',
         '../ui/events/events.gyp:events_base',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../url/url.gyp:url_lib',
         'shared_memory_support',
       ],
       'export_dependent_settings': [
         '../third_party/opus/opus.gyp:opus',
@@ skipping 408 matching lines @@
         'capture/video/win/sink_filter_win.cc',
         'capture/video/win/sink_filter_win.h',
         'capture/video/win/sink_input_pin_win.cc',
         'capture/video/win/sink_input_pin_win.h',
         'capture/video/win/video_capture_device_factory_win.cc',
         'capture/video/win/video_capture_device_factory_win.h',
         'capture/video/win/video_capture_device_mf_win.cc',
         'capture/video/win/video_capture_device_mf_win.h',
         'capture/video/win/video_capture_device_win.cc',
         'capture/video/win/video_capture_device_win.h',
+        'capture/webm_muxer.cc',
+        'capture/webm_muxer.h',
         'cdm/aes_decryptor.cc',
         'cdm/aes_decryptor.h',
         'cdm/cdm_adapter.cc',
         'cdm/cdm_adapter.h',
         'cdm/default_cdm_factory.cc',
         'cdm/default_cdm_factory.h',
         'cdm/json_web_key.cc',
         'cdm/json_web_key.h',
         'cdm/key_system_names.cc',
         'cdm/key_system_names.h',
@@ skipping 204 matching lines @@
             'defines': [
               'MEDIA_DISABLE_LIBVPX',
             ],
           },
           # Exclude the sources that depend on libvpx.
           'sources!': [
             'filters/vpx_video_decoder.cc',
             'filters/vpx_video_decoder.h',
           ],
         }],
-        ['media_use_libwebm==1', {
-          'dependencies': [
-            '<(DEPTH)/third_party/libwebm/libwebm.gyp:libwebm',
-          ],
-          'sources': [
-            'capture/webm_muxer.cc',
-            'capture/webm_muxer.h',
-          ],
-        }, {  # media_use_libwebm==0
-          'defines': [
-            'MEDIA_DISABLE_LIBWEBM',
-          ],
-          'direct_dependent_settings': {
-            'defines': [
-              'MEDIA_DISABLE_LIBWEBM',
-            ],
-          },
-        }],
         ['OS=="android"', {
           'dependencies': [
             'media_android_jni_headers',
             'media_java',
             'player_android',
             'video_capture_android_jni_headers',
           ],
           'sources!': [
             'base/audio_video_metadata_extractor.cc',
             'base/audio_video_metadata_extractor.h',
@@ skipping 439 matching lines @@
         'media_test_support',
         'shared_memory_support',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../gpu/gpu.gyp:command_buffer_common',
         '../gpu/gpu.gyp:gpu_unittest_utils',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
+        '../third_party/libwebm/libwebm.gyp:libwebm',
         '../third_party/libyuv/libyuv.gyp:libyuv',
         '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/gfx/gfx.gyp:gfx_test_support',
         '../url/url.gyp:url_lib',
       ],
       'sources': [
         'base/android/access_unit_queue_unittest.cc',
         'base/android/media_codec_bridge_unittest.cc',
@@ skipping 61 matching lines @@
         'base/video_util_unittest.cc',
         'base/wall_clock_time_source_unittest.cc',
         'base/yuv_convert_unittest.cc',
         'capture/content/animated_content_sampler_unittest.cc',
         'capture/content/capture_resolution_chooser_unittest.cc',
         'capture/content/feedback_signal_accumulator_unittest.cc',
         'capture/content/smooth_event_sampler_unittest.cc',
         'capture/content/video_capture_oracle_unittest.cc',
         'capture/video/fake_video_capture_device_unittest.cc',
         'capture/video/video_capture_device_unittest.cc',
+        'capture/webm_muxer_unittest.cc',
         'cdm/aes_decryptor_unittest.cc',
         'cdm/json_web_key_unittest.cc',
         'ffmpeg/ffmpeg_common_unittest.cc',
         'filters/audio_clock_unittest.cc',
         'filters/audio_decoder_selector_unittest.cc',
         'filters/audio_decoder_unittest.cc',
         'filters/audio_file_reader_unittest.cc',
         'filters/audio_renderer_algorithm_unittest.cc',
         'filters/blocking_url_protocol_unittest.cc',
         'filters/chunk_demuxer_unittest.cc',
@@ skipping 83 matching lines @@
             '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',
           ],
         }],
-        ['media_use_libwebm==1', {
-          'dependencies': [
-            '<(DEPTH)/third_party/libwebm/libwebm.gyp:libwebm',
-          ],
-          'sources': [
-            'capture/webm_muxer_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 742 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }