| OLD | NEW | 
|     1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |     1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
|     2 # Use of this source code is governed by a BSD-style license that can be |     2 # Use of this source code is governed by a BSD-style license that can be | 
|     3 # found in the LICENSE file. |     3 # found in the LICENSE file. | 
|     4  |     4  | 
|     5 { |     5 { | 
|     6   'variables': { |     6   'variables': { | 
|     7     'chromium_code': 1, |     7     'chromium_code': 1, | 
|     8     # Override to dynamically link the cras (ChromeOS audio) library. |     8     # Override to dynamically link the cras (ChromeOS audio) library. | 
|     9     'use_cras%': 0, |     9     'use_cras%': 0, | 
|    10     # Option e.g. for Linux distributions to link pulseaudio directly |    10     # Option e.g. for Linux distributions to link pulseaudio directly | 
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|    42         'enable_hevc_demuxing%': 1, |    42         'enable_hevc_demuxing%': 1, | 
|    43         'enable_mse_mpeg2ts_stream_parser%': 1, |    43         'enable_mse_mpeg2ts_stream_parser%': 1, | 
|    44       }, { |    44       }, { | 
|    45         'enable_ac3_eac3_audio_demuxing%': 0, |    45         'enable_ac3_eac3_audio_demuxing%': 0, | 
|    46         'enable_hevc_demuxing%': 0, |    46         'enable_hevc_demuxing%': 0, | 
|    47         'enable_mse_mpeg2ts_stream_parser%': 0, |    47         'enable_mse_mpeg2ts_stream_parser%': 0, | 
|    48       }], |    48       }], | 
|    49     ], |    49     ], | 
|    50   }, |    50   }, | 
|    51   'includes': [ |    51   'includes': [ | 
|    52     'capture/capture.gypi', |  | 
|    53     'media_cdm.gypi', |    52     'media_cdm.gypi', | 
|    54     'media_variables.gypi', |    53     'media_variables.gypi', | 
|    55   ], |    54   ], | 
|    56   'targets': [ |    55   'targets': [ | 
|    57     { |    56     { | 
|    58       # GN version: //media:media_features |    57       # GN version: //media:media_features | 
|    59       'target_name': 'media_features', |    58       'target_name': 'media_features', | 
|    60       'includes': [ '../build/buildflag_header.gypi' ], |    59       'includes': [ '../build/buildflag_header.gypi' ], | 
|    61       'hard_dependency': 1, |    60       'hard_dependency': 1, | 
|    62       'variables': { |    61       'variables': { | 
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|    96         '../third_party/libwebm/libwebm.gyp:libwebm', |    95         '../third_party/libwebm/libwebm.gyp:libwebm', | 
|    97         '../third_party/opus/opus.gyp:opus', |    96         '../third_party/opus/opus.gyp:opus', | 
|    98         'media_features', |    97         'media_features', | 
|    99       ], |    98       ], | 
|   100       'defines': [ |    99       'defines': [ | 
|   101         'MEDIA_IMPLEMENTATION', |   100         'MEDIA_IMPLEMENTATION', | 
|   102       ], |   101       ], | 
|   103       'include_dirs': [ |   102       'include_dirs': [ | 
|   104         '..', |   103         '..', | 
|   105       ], |   104       ], | 
|   106       'includes': [ |  | 
|   107         'capture/capture.gypi', |  | 
|   108       ], |  | 
|   109       'sources': [ |   105       'sources': [ | 
|   110         '<@(capture_sources)', |  | 
|   111         'audio/agc_audio_stream.h', |   106         'audio/agc_audio_stream.h', | 
|   112         'audio/alsa/alsa_input.cc', |   107         'audio/alsa/alsa_input.cc', | 
|   113         'audio/alsa/alsa_input.h', |   108         'audio/alsa/alsa_input.h', | 
|   114         'audio/alsa/alsa_output.cc', |   109         'audio/alsa/alsa_output.cc', | 
|   115         'audio/alsa/alsa_output.h', |   110         'audio/alsa/alsa_output.h', | 
|   116         'audio/alsa/alsa_util.cc', |   111         'audio/alsa/alsa_util.cc', | 
|   117         'audio/alsa/alsa_util.h', |   112         'audio/alsa/alsa_util.h', | 
|   118         'audio/alsa/alsa_wrapper.cc', |   113         'audio/alsa/alsa_wrapper.cc', | 
|   119         'audio/alsa/alsa_wrapper.h', |   114         'audio/alsa/alsa_wrapper.h', | 
|   120         'audio/alsa/audio_manager_alsa.cc', |   115         'audio/alsa/audio_manager_alsa.cc', | 
| (...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   469         'base/video_frame_pool.h', |   464         'base/video_frame_pool.h', | 
|   470         'base/video_renderer.cc', |   465         'base/video_renderer.cc', | 
|   471         'base/video_renderer.h', |   466         'base/video_renderer.h', | 
|   472         'base/video_rotation.h', |   467         'base/video_rotation.h', | 
|   473         'base/video_types.cc', |   468         'base/video_types.cc', | 
|   474         'base/video_types.h', |   469         'base/video_types.h', | 
|   475         'base/video_util.cc', |   470         'base/video_util.cc', | 
|   476         'base/video_util.h', |   471         'base/video_util.h', | 
|   477         'base/wall_clock_time_source.cc', |   472         'base/wall_clock_time_source.cc', | 
|   478         'base/wall_clock_time_source.h', |   473         'base/wall_clock_time_source.h', | 
|   479         'base/win/mf_initializer.cc', |  | 
|   480         'base/win/mf_initializer.h', |  | 
|   481         'base/yuv_convert.cc', |   474         'base/yuv_convert.cc', | 
|   482         'base/yuv_convert.h', |   475         'base/yuv_convert.h', | 
|   483         'cdm/aes_decryptor.cc', |   476         'cdm/aes_decryptor.cc', | 
|   484         'cdm/aes_decryptor.h', |   477         'cdm/aes_decryptor.h', | 
|   485         'cdm/cdm_adapter.cc', |   478         'cdm/cdm_adapter.cc', | 
|   486         'cdm/cdm_adapter.h', |   479         'cdm/cdm_adapter.h', | 
|   487         'cdm/cdm_allocator.cc', |   480         'cdm/cdm_allocator.cc', | 
|   488         'cdm/cdm_allocator.h', |   481         'cdm/cdm_allocator.h', | 
|   489         'cdm/cdm_file_io.h', |   482         'cdm/cdm_file_io.h', | 
|   490         'cdm/cdm_file_io.h', |   483         'cdm/cdm_file_io.h', | 
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   707             ], |   700             ], | 
|   708           }, |   701           }, | 
|   709           # Exclude the sources that depend on libvpx. |   702           # Exclude the sources that depend on libvpx. | 
|   710           'sources!': [ |   703           'sources!': [ | 
|   711             'filters/vpx_video_decoder.cc', |   704             'filters/vpx_video_decoder.cc', | 
|   712             'filters/vpx_video_decoder.h', |   705             'filters/vpx_video_decoder.h', | 
|   713           ], |   706           ], | 
|   714         }], |   707         }], | 
|   715         ['OS=="android"', { |   708         ['OS=="android"', { | 
|   716           'dependencies': [ |   709           'dependencies': [ | 
|   717             'capture_java', |  | 
|   718             'media_android_jni_headers', |   710             'media_android_jni_headers', | 
|   719             'media_java', |   711             'media_java', | 
|   720             'player_android', |   712             'player_android', | 
|   721             'video_capture_android_jni_headers', |  | 
|   722           ], |   713           ], | 
|   723           'sources!': [ |   714           'sources!': [ | 
|   724             'base/audio_video_metadata_extractor.cc', |   715             'base/audio_video_metadata_extractor.cc', | 
|   725             'base/audio_video_metadata_extractor.h', |   716             'base/audio_video_metadata_extractor.h', | 
|   726             'base/media_file_checker.cc', |   717             'base/media_file_checker.cc', | 
|   727             'base/media_file_checker.h', |   718             'base/media_file_checker.h', | 
|   728             'filters/decrypting_audio_decoder.cc', |   719             'filters/decrypting_audio_decoder.cc', | 
|   729             'filters/decrypting_audio_decoder.h', |   720             'filters/decrypting_audio_decoder.h', | 
|   730             'filters/decrypting_video_decoder.cc', |   721             'filters/decrypting_video_decoder.cc', | 
|   731             'filters/decrypting_video_decoder.h', |   722             'filters/decrypting_video_decoder.h', | 
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   814             }, {  # else: use_cras==0 |   805             }, {  # else: use_cras==0 | 
|   815               'sources!': [ |   806               'sources!': [ | 
|   816                 'audio/cras/audio_manager_cras.cc', |   807                 'audio/cras/audio_manager_cras.cc', | 
|   817                 'audio/cras/audio_manager_cras.h', |   808                 'audio/cras/audio_manager_cras.h', | 
|   818                 'audio/cras/cras_input.cc', |   809                 'audio/cras/cras_input.cc', | 
|   819                 'audio/cras/cras_input.h', |   810                 'audio/cras/cras_input.h', | 
|   820                 'audio/cras/cras_unified.cc', |   811                 'audio/cras/cras_unified.cc', | 
|   821                 'audio/cras/cras_unified.h', |   812                 'audio/cras/cras_unified.h', | 
|   822               ], |   813               ], | 
|   823             }], |   814             }], | 
|   824  |  | 
|   825             ['use_udev==1', { |  | 
|   826               'dependencies': [ |  | 
|   827                 '<(DEPTH)/device/udev_linux/udev.gyp:udev_linux', |  | 
|   828               ], |  | 
|   829             }], |  | 
|   830           ], |   815           ], | 
|   831         }], |   816         }], | 
|   832         ['OS!="linux"', { |   817         ['OS!="linux"', { | 
|   833           'sources!': [ |   818           'sources!': [ | 
|   834             'audio/cras/audio_manager_cras.cc', |   819             'audio/cras/audio_manager_cras.cc', | 
|   835             'audio/cras/audio_manager_cras.h', |   820             'audio/cras/audio_manager_cras.h', | 
|   836             'audio/cras/cras_input.cc', |   821             'audio/cras/cras_input.cc', | 
|   837             'audio/cras/cras_input.h', |   822             'audio/cras/cras_input.h', | 
|   838             'audio/cras/cras_unified.cc', |   823             'audio/cras/cras_unified.cc', | 
|   839             'audio/cras/cras_unified.h', |   824             'audio/cras/cras_unified.h', | 
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   917             'audio/pulse/audio_manager_pulse.h', |   902             'audio/pulse/audio_manager_pulse.h', | 
|   918             'audio/pulse/pulse_input.cc', |   903             'audio/pulse/pulse_input.cc', | 
|   919             'audio/pulse/pulse_input.h', |   904             'audio/pulse/pulse_input.h', | 
|   920             'audio/pulse/pulse_output.cc', |   905             'audio/pulse/pulse_output.cc', | 
|   921             'audio/pulse/pulse_output.h', |   906             'audio/pulse/pulse_output.h', | 
|   922             'audio/pulse/pulse_util.cc', |   907             'audio/pulse/pulse_util.cc', | 
|   923             'audio/pulse/pulse_util.h', |   908             'audio/pulse/pulse_util.h', | 
|   924           ], |   909           ], | 
|   925         }], |   910         }], | 
|   926         ['OS=="mac"', { |   911         ['OS=="mac"', { | 
|   927           'dependencies': [ |  | 
|   928             '<(DEPTH)/third_party/decklink/decklink.gyp:decklink', |  | 
|   929           ], |  | 
|   930  |  | 
|   931           'link_settings': { |   912           'link_settings': { | 
|   932             'libraries': [ |   913             'libraries': [ | 
|   933               '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework', |   914               '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework', | 
|   934               '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework', |   915               '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework', | 
|   935               '$(SDKROOT)/System/Library/Frameworks/AVFoundation.framework', |   916               '$(SDKROOT)/System/Library/Frameworks/AVFoundation.framework', | 
|   936               '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework', |   917               '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework', | 
|   937               '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework', |   918               '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework', | 
|   938               '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', |   919               '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', | 
|   939             ], |   920             ], | 
|   940           }, |   921           }, | 
|   941         }], |   922         }], | 
|   942         ['OS=="win"', { |   923         ['OS=="win"', { | 
|   943           'link_settings':  { |  | 
|   944             'libraries': [ |  | 
|   945               '-ldxguid.lib', |  | 
|   946               '-lmf.lib', |  | 
|   947               '-lmfplat.lib', |  | 
|   948               '-lmfreadwrite.lib', |  | 
|   949               '-lmfuuid.lib', |  | 
|   950               '-lsetupapi.lib', |  | 
|   951               '-lwinmm.lib', |  | 
|   952             ], |  | 
|   953           }, |  | 
|   954           # Specify delayload for media.dll. |  | 
|   955           'msvs_settings': { |  | 
|   956             'VCLinkerTool': { |  | 
|   957               'DelayLoadDLLs': [ |  | 
|   958                 'mf.dll', |  | 
|   959                 'mfplat.dll', |  | 
|   960                 'mfreadwrite.dll', |  | 
|   961               ], |  | 
|   962             }, |  | 
|   963           }, |  | 
|   964           # Specify delayload for components that link with media.lib. |  | 
|   965           'all_dependent_settings': { |  | 
|   966             'msvs_settings': { |  | 
|   967               'VCLinkerTool': { |  | 
|   968                 'DelayLoadDLLs': [ |  | 
|   969                   'mf.dll', |  | 
|   970                   'mfplat.dll', |  | 
|   971                   'mfreadwrite.dll', |  | 
|   972                 ], |  | 
|   973               }, |  | 
|   974             }, |  | 
|   975           }, |  | 
|   976           # TODO(wolenetz): Fix size_t to int truncations in win64. See |   924           # TODO(wolenetz): Fix size_t to int truncations in win64. See | 
|   977           # http://crbug.com/171009 |   925           # http://crbug.com/171009 | 
|   978           'conditions': [ |   926           'conditions': [ | 
|   979             ['target_arch=="x64"', { |   927             ['target_arch=="x64"', { | 
|   980               'msvs_disabled_warnings': [ 4267, ], |   928               'msvs_disabled_warnings': [ 4267, ], | 
|   981             }], |   929             }], | 
|   982           ], |   930           ], | 
|   983         }], |   931         }], | 
|   984         ['proprietary_codecs==1', { |   932         ['proprietary_codecs==1', { | 
|   985           'sources': [ |   933           'sources': [ | 
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1121       'dependencies': [ |  1069       'dependencies': [ | 
|  1122         '../base/base.gyp:base', |  1070         '../base/base.gyp:base', | 
|  1123       ] |  1071       ] | 
|  1124     }, |  1072     }, | 
|  1125     { |  1073     { | 
|  1126       # GN version: //media:media_unittests |  1074       # GN version: //media:media_unittests | 
|  1127       'target_name': 'media_unittests', |  1075       'target_name': 'media_unittests', | 
|  1128       'type': '<(gtest_target_type)', |  1076       'type': '<(gtest_target_type)', | 
|  1129       'dependencies': [ |  1077       'dependencies': [ | 
|  1130         'audio_test_config', |  1078         'audio_test_config', | 
 |  1079         'capture/capture.gyp:unittests', | 
|  1131         'cdm_paths', |  1080         'cdm_paths', | 
|  1132         'media', |  1081         'media', | 
|  1133         'media_features', |  1082         'media_features', | 
|  1134         'media_test_support', |  1083         'media_test_support', | 
|  1135         'shared_memory_support', |  1084         'shared_memory_support', | 
|  1136         '../base/base.gyp:base', |  1085         '../base/base.gyp:base', | 
|  1137         '../base/base.gyp:base_i18n', |  1086         '../base/base.gyp:base_i18n', | 
|  1138         '../base/base.gyp:test_support_base', |  1087         '../base/base.gyp:test_support_base', | 
|  1139         '../gpu/gpu.gyp:command_buffer_common', |  1088         '../gpu/gpu.gyp:command_buffer_common', | 
|  1140         '../gpu/gpu.gyp:gpu_unittest_utils', |  1089         '../gpu/gpu.gyp:gpu_unittest_utils', | 
|  1141         '../skia/skia.gyp:skia', |  1090         '../skia/skia.gyp:skia', | 
|  1142         '../testing/gmock.gyp:gmock', |  1091         '../testing/gmock.gyp:gmock', | 
|  1143         '../testing/gtest.gyp:gtest', |  1092         '../testing/gtest.gyp:gtest', | 
|  1144         '../third_party/libwebm/libwebm.gyp:libwebm', |  1093         '../third_party/libwebm/libwebm.gyp:libwebm', | 
|  1145         '../third_party/libyuv/libyuv.gyp:libyuv', |  1094         '../third_party/libyuv/libyuv.gyp:libyuv', | 
|  1146         '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', |  1095         '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', | 
|  1147         '../ui/gfx/gfx.gyp:gfx', |  1096         '../ui/gfx/gfx.gyp:gfx', | 
|  1148         '../ui/gfx/gfx.gyp:gfx_geometry', |  1097         '../ui/gfx/gfx.gyp:gfx_geometry', | 
|  1149         '../ui/gfx/gfx.gyp:gfx_test_support', |  1098         '../ui/gfx/gfx.gyp:gfx_test_support', | 
|  1150         '../url/url.gyp:url_lib', |  1099         '../url/url.gyp:url_lib', | 
|  1151       ], |  1100       ], | 
|  1152       'sources': [ |  1101       'sources': [ | 
|  1153         '<@(capture_unittests_sources)', |  | 
|  1154         'base/android/access_unit_queue_unittest.cc', |  1102         'base/android/access_unit_queue_unittest.cc', | 
|  1155         'base/android/media_codec_decoder_unittest.cc', |  1103         'base/android/media_codec_decoder_unittest.cc', | 
|  1156         'base/android/media_drm_bridge_unittest.cc', |  1104         'base/android/media_drm_bridge_unittest.cc', | 
|  1157         'base/android/media_player_bridge_unittest.cc', |  1105         'base/android/media_player_bridge_unittest.cc', | 
|  1158         'base/android/media_source_player_unittest.cc', |  1106         'base/android/media_source_player_unittest.cc', | 
|  1159         'base/android/sdk_media_codec_bridge_unittest.cc', |  1107         'base/android/sdk_media_codec_bridge_unittest.cc', | 
|  1160         'base/android/test_data_factory.cc', |  1108         'base/android/test_data_factory.cc', | 
|  1161         'base/android/test_data_factory.h', |  1109         'base/android/test_data_factory.h', | 
|  1162         'base/android/test_statistics.h', |  1110         'base/android/test_statistics.h', | 
|  1163         'base/audio_block_fifo_unittest.cc', |  1111         'base/audio_block_fifo_unittest.cc', | 
| (...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1539             ], |  1487             ], | 
|  1540             'defines': [ |  1488             'defines': [ | 
|  1541               'USE_CRAS', |  1489               'USE_CRAS', | 
|  1542             ], |  1490             ], | 
|  1543           }], |  1491           }], | 
|  1544         ], |  1492         ], | 
|  1545       }, |  1493       }, | 
|  1546     }, |  1494     }, | 
|  1547     { |  1495     { | 
|  1548       # GN version: //media:audio_unittests |  1496       # GN version: //media:audio_unittests | 
|  1549       # For running the subset of media_unittests that might require audio |  1497       # For running the subset of tests that might require audio | 
|  1550       # hardware separately on GPU bots. media_unittests includes these too. |  1498       # hardware separately on GPU bots. media_unittests includes these too. | 
|  1551       'target_name': 'audio_unittests', |  1499       'target_name': 'audio_unittests', | 
|  1552       'type': '<(gtest_target_type)', |  1500       'type': '<(gtest_target_type)', | 
|  1553       'dependencies': [ |  1501       'dependencies': [ | 
|  1554         'audio_test_config', |  1502         'audio_test_config', | 
 |  1503         'capture/capture.gyp:unittests', | 
|  1555         'media_test_support', |  1504         'media_test_support', | 
|  1556         '../base/base.gyp:test_support_base', |  1505         '../base/base.gyp:test_support_base', | 
|  1557         '../testing/gmock.gyp:gmock', |  1506         '../testing/gmock.gyp:gmock', | 
|  1558         '../testing/gtest.gyp:gtest', |  1507         '../testing/gtest.gyp:gtest', | 
|  1559         '../ui/gfx/gfx.gyp:gfx_test_support', |  1508         '../ui/gfx/gfx.gyp:gfx_test_support', | 
|  1560         '../url/url.gyp:url_lib', |  1509         '../url/url.gyp:url_lib', | 
|  1561       ], |  1510       ], | 
|  1562       'sources': [ |  1511       'sources': [ | 
|  1563         'base/run_all_unittests.cc', |  1512         'base/run_all_unittests.cc', | 
|  1564       ], |  1513       ], | 
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1742               'base/simd/scale_yuv_to_rgb_mmx.inc', |  1691               'base/simd/scale_yuv_to_rgb_mmx.inc', | 
|  1743             ], |  1692             ], | 
|  1744           }, |  1693           }, | 
|  1745           'msvs_2010_disable_uldi_when_referenced': 1, |  1694           'msvs_2010_disable_uldi_when_referenced': 1, | 
|  1746           'includes': [ |  1695           'includes': [ | 
|  1747             '../third_party/yasm/yasm_compile.gypi', |  1696             '../third_party/yasm/yasm_compile.gypi', | 
|  1748           ], |  1697           ], | 
|  1749         }, |  1698         }, | 
|  1750       ], # targets |  1699       ], # targets | 
|  1751     }], |  1700     }], | 
 |  1701     ['OS=="win"', { | 
 |  1702       'targets': [ | 
 |  1703         { | 
 |  1704           # GN version: //media/base/win | 
 |  1705           'target_name': 'mf_initializer', | 
 |  1706           'type': '<(component)', | 
 |  1707           'include_dirs': [ '..', ], | 
 |  1708           'defines': [ 'MEDIA_IMPLEMENTATION', ], | 
 |  1709           'sources': [ | 
 |  1710             'base/win/mf_initializer.cc', | 
 |  1711             'base/win/mf_initializer.h', | 
 |  1712           ], | 
 |  1713           'dependencies': [ | 
 |  1714             '../base/base.gyp:base', | 
 |  1715           ], | 
 |  1716           'link_settings':  { | 
 |  1717             'libraries': [ | 
 |  1718               '-ldxguid.lib', | 
 |  1719               '-lmf.lib', | 
 |  1720               '-lmfplat.lib', | 
 |  1721               '-lmfreadwrite.lib', | 
 |  1722               '-lmfuuid.lib', | 
 |  1723               '-lsetupapi.lib', | 
 |  1724               '-lwinmm.lib', | 
 |  1725             ], | 
 |  1726           }, | 
 |  1727           'msvs_settings': { | 
 |  1728             'VCLinkerTool': { | 
 |  1729               'DelayLoadDLLs': [ | 
 |  1730                 'mf.dll', | 
 |  1731                 'mfplat.dll', | 
 |  1732                 'mfreadwrite.dll', | 
 |  1733               ], | 
 |  1734             }, | 
 |  1735           }, | 
 |  1736           'all_dependent_settings': { | 
 |  1737             'msvs_settings': { | 
 |  1738               'VCLinkerTool': { | 
 |  1739                 'DelayLoadDLLs': [ | 
 |  1740                   'mf.dll', | 
 |  1741                   'mfplat.dll', | 
 |  1742                   'mfreadwrite.dll', | 
 |  1743                 ], | 
 |  1744               }, | 
 |  1745             }, | 
 |  1746           }, | 
 |  1747         }, | 
 |  1748       ], | 
 |  1749     }], | 
|  1752     ['OS=="android"', { |  1750     ['OS=="android"', { | 
|  1753       'targets': [ |  1751       'targets': [ | 
|  1754         { |  1752         { | 
|  1755           # TODO(GN) |  1753           # TODO(GN) | 
|  1756           'target_name': 'media_unittests_apk', |  1754           'target_name': 'media_unittests_apk', | 
|  1757           'type': 'none', |  1755           'type': 'none', | 
|  1758           'dependencies': [ |  1756           'dependencies': [ | 
|  1759             'capture_java', |  | 
|  1760             'media_java', |  1757             'media_java', | 
|  1761             'media_unittests', |  1758             'media_unittests', | 
|  1762           ], |  1759           ], | 
|  1763           'variables': { |  1760           'variables': { | 
|  1764             'test_suite_name': 'media_unittests', |  1761             'test_suite_name': 'media_unittests', | 
|  1765             'isolate_file': 'media_unittests.isolate', |  1762             'isolate_file': 'media_unittests.isolate', | 
|  1766           }, |  1763           }, | 
|  1767           'includes': ['../build/apk_test.gypi'], |  1764           'includes': ['../build/apk_test.gypi'], | 
|  1768         }, |  1765         }, | 
|  1769         { |  1766         { | 
|  1770           # TODO(GN) |  1767           # TODO(GN) | 
|  1771           'target_name': 'media_perftests_apk', |  1768           'target_name': 'media_perftests_apk', | 
|  1772           'type': 'none', |  1769           'type': 'none', | 
|  1773           'dependencies': [ |  1770           'dependencies': [ | 
|  1774             'capture_java', |  | 
|  1775             'media_java', |  1771             'media_java', | 
|  1776             'media_perftests', |  1772             'media_perftests', | 
|  1777           ], |  1773           ], | 
|  1778           'variables': { |  1774           'variables': { | 
|  1779             'test_suite_name': 'media_perftests', |  1775             'test_suite_name': 'media_perftests', | 
|  1780             'isolate_file': 'media_perftests.isolate', |  1776             'isolate_file': 'media_perftests.isolate', | 
|  1781           }, |  1777           }, | 
|  1782           'includes': ['../build/apk_test.gypi'], |  1778           'includes': ['../build/apk_test.gypi'], | 
|  1783         }, |  1779         }, | 
|  1784         { |  1780         { | 
|  1785           # GN: //media/base/android:media_jni_headers |  1781           # GN: //media/base/android:media_jni_headers | 
|  1786           'target_name': 'media_android_jni_headers', |  1782           'target_name': 'media_android_jni_headers', | 
|  1787           'type': 'none', |  1783           'type': 'none', | 
|  1788           'sources': [ |  1784           'sources': [ | 
|  1789             'base/android/java/src/org/chromium/media/AudioManagerAndroid.java', |  1785             'base/android/java/src/org/chromium/media/AudioManagerAndroid.java', | 
|  1790             'base/android/java/src/org/chromium/media/AudioRecordInput.java', |  1786             'base/android/java/src/org/chromium/media/AudioRecordInput.java', | 
|  1791             'base/android/java/src/org/chromium/media/MediaCodecBridge.java', |  1787             'base/android/java/src/org/chromium/media/MediaCodecBridge.java', | 
|  1792             'base/android/java/src/org/chromium/media/MediaCodecUtil.java', |  1788             'base/android/java/src/org/chromium/media/MediaCodecUtil.java', | 
|  1793             'base/android/java/src/org/chromium/media/MediaDrmBridge.java', |  1789             'base/android/java/src/org/chromium/media/MediaDrmBridge.java', | 
|  1794             'base/android/java/src/org/chromium/media/MediaPlayerBridge.java', |  1790             'base/android/java/src/org/chromium/media/MediaPlayerBridge.java', | 
|  1795             'base/android/java/src/org/chromium/media/MediaPlayerListener.java', |  1791             'base/android/java/src/org/chromium/media/MediaPlayerListener.java', | 
|  1796           ], |  1792           ], | 
|  1797           'variables': { |  1793           'variables': { | 
|  1798             'jni_gen_package': 'media', |  1794             'jni_gen_package': 'media', | 
|  1799           }, |  1795           }, | 
|  1800           'includes': ['../build/jni_generator.gypi'], |  1796           'includes': ['../build/jni_generator.gypi'], | 
|  1801         }, |  1797         }, | 
|  1802         { |  1798         { | 
|  1803           # GN: //media/capture/video/android:capture_jni_headers |  | 
|  1804           'target_name': 'video_capture_android_jni_headers', |  | 
|  1805           'type': 'none', |  | 
|  1806           'sources': [ |  | 
|  1807             'capture/video/android/java/src/org/chromium/media/VideoCapture.java
      ', |  | 
|  1808             'capture/video/android/java/src/org/chromium/media/VideoCaptureFacto
      ry.java', |  | 
|  1809           ], |  | 
|  1810           'variables': { |  | 
|  1811             'jni_gen_package': 'media', |  | 
|  1812           }, |  | 
|  1813           'includes': ['../build/jni_generator.gypi'], |  | 
|  1814         }, |  | 
|  1815         { |  | 
|  1816           # GN: //media/base/android:android |  1799           # GN: //media/base/android:android | 
|  1817           'target_name': 'player_android', |  1800           'target_name': 'player_android', | 
|  1818           'type': 'static_library', |  1801           'type': 'static_library', | 
|  1819           'sources': [ |  1802           'sources': [ | 
|  1820             'base/android/access_unit_queue.cc', |  1803             'base/android/access_unit_queue.cc', | 
|  1821             'base/android/access_unit_queue.h', |  1804             'base/android/access_unit_queue.h', | 
|  1822             'base/android/android_cdm_factory.cc', |  1805             'base/android/android_cdm_factory.cc', | 
|  1823             'base/android/android_cdm_factory.h', |  1806             'base/android/android_cdm_factory.h', | 
|  1824             'base/android/audio_decoder_job.cc', |  1807             'base/android/audio_decoder_job.cc', | 
|  1825             'base/android/audio_decoder_job.h', |  1808             'base/android/audio_decoder_job.h', | 
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1895           ], |  1878           ], | 
|  1896           'include_dirs': [ |  1879           'include_dirs': [ | 
|  1897             # Needed by media_drm_bridge.cc. |  1880             # Needed by media_drm_bridge.cc. | 
|  1898             '<(SHARED_INTERMEDIATE_DIR)', |  1881             '<(SHARED_INTERMEDIATE_DIR)', | 
|  1899           ], |  1882           ], | 
|  1900           'defines': [ |  1883           'defines': [ | 
|  1901             'MEDIA_IMPLEMENTATION', |  1884             'MEDIA_IMPLEMENTATION', | 
|  1902           ], |  1885           ], | 
|  1903         }, |  1886         }, | 
|  1904         { |  1887         { | 
|  1905           # GN: //media/capture/video/android:capture_java |  | 
|  1906           'target_name': 'capture_java', |  | 
|  1907           'type': 'none', |  | 
|  1908           'dependencies': [ |  | 
|  1909             '../base/base.gyp:base', |  | 
|  1910             'media_android_captureapitype', |  | 
|  1911             'media_android_imageformat', |  | 
|  1912           ], |  | 
|  1913           'export_dependent_settings': [ |  | 
|  1914             '../base/base.gyp:base', |  | 
|  1915           ], |  | 
|  1916           'variables': { |  | 
|  1917             'java_in_dir': 'capture/video/android/java', |  | 
|  1918           }, |  | 
|  1919           'includes': ['../build/java.gypi'], |  | 
|  1920         }, |  | 
|  1921         { |  | 
|  1922           # GN: //media/base/android:media_java |  1888           # GN: //media/base/android:media_java | 
|  1923           'target_name': 'media_java', |  1889           'target_name': 'media_java', | 
|  1924           'type': 'none', |  1890           'type': 'none', | 
|  1925           'dependencies': [ |  1891           'dependencies': [ | 
|  1926             '../base/base.gyp:base', |  1892             '../base/base.gyp:base', | 
|  1927           ], |  1893           ], | 
|  1928           'export_dependent_settings': [ |  1894           'export_dependent_settings': [ | 
|  1929             '../base/base.gyp:base', |  1895             '../base/base.gyp:base', | 
|  1930           ], |  1896           ], | 
|  1931           'variables': { |  1897           'variables': { | 
|  1932             'java_in_dir': 'base/android/java', |  1898             'java_in_dir': 'base/android/java', | 
|  1933           }, |  1899           }, | 
|  1934           'includes': ['../build/java.gypi'], |  1900           'includes': ['../build/java.gypi'], | 
|  1935         }, |  1901         }, | 
|  1936         { |  | 
|  1937           # GN: //media/base/android:media_android_captureapitype |  | 
|  1938           'target_name': 'media_android_captureapitype', |  | 
|  1939           'type': 'none', |  | 
|  1940           'variables': { |  | 
|  1941             'source_file': 'capture/video/video_capture_device.h', |  | 
|  1942           }, |  | 
|  1943           'includes': [ '../build/android/java_cpp_enum.gypi' ], |  | 
|  1944         }, |  | 
|  1945         { |  | 
|  1946           # GN: //media/base/android:media_android_imageformat |  | 
|  1947           'target_name': 'media_android_imageformat', |  | 
|  1948           'type': 'none', |  | 
|  1949           'variables': { |  | 
|  1950             'source_file': 'capture/video/android/video_capture_device_android.h
      ', |  | 
|  1951           }, |  | 
|  1952           'includes': [ '../build/android/java_cpp_enum.gypi' ], |  | 
|  1953         }, |  | 
|  1954       ], |  1902       ], | 
|  1955       'conditions': [ |  1903       'conditions': [ | 
|  1956         ['test_isolation_mode != "noop"', |  1904         ['test_isolation_mode != "noop"', | 
|  1957           { |  1905           { | 
|  1958             'targets': [ |  1906             'targets': [ | 
|  1959               { |  1907               { | 
|  1960                 'target_name': 'media_unittests_apk_run', |  1908                 'target_name': 'media_unittests_apk_run', | 
|  1961                 'type': 'none', |  1909                 'type': 'none', | 
|  1962                 'dependencies': [ |  1910                 'dependencies': [ | 
|  1963                   'media_unittests_apk', |  1911                   'media_unittests_apk', | 
| (...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  2318                 'dependencies': [ |  2266                 'dependencies': [ | 
|  2319                   '../build/linux/system.gyp:libdrm', |  2267                   '../build/linux/system.gyp:libdrm', | 
|  2320                 ] |  2268                 ] | 
|  2321               }], |  2269               }], | 
|  2322             ], |  2270             ], | 
|  2323           } |  2271           } | 
|  2324         ] |  2272         ] | 
|  2325     }], |  2273     }], | 
|  2326   ], |  2274   ], | 
|  2327 } |  2275 } | 
| OLD | NEW |