Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'use_v4lplugin%': 0, | 3 'use_v4lplugin%': 0, |
| 4 'use_v4l2_codec%': 0, | 4 'use_v4l2_codec%': 0, |
| 5 }, | 5 }, |
| 6 'defines': [ | 6 'defines': [ |
| 7 'MEDIA_GPU_IMPLEMENTATION' | 7 'MEDIA_GPU_IMPLEMENTATION' |
| 8 ], | 8 ], |
| 9 'dependencies': [ | 9 'dependencies': [ |
| 10 '../base/base.gyp:base', | 10 '../base/base.gyp:base', |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 117 ['OS=="android" and enable_webrtc==1', { | 117 ['OS=="android" and enable_webrtc==1', { |
| 118 'dependencies': [ | 118 'dependencies': [ |
| 119 '../third_party/libyuv/libyuv.gyp:libyuv', | 119 '../third_party/libyuv/libyuv.gyp:libyuv', |
| 120 ], | 120 ], |
| 121 'sources': [ | 121 'sources': [ |
| 122 'gpu/android_video_encode_accelerator.cc', | 122 'gpu/android_video_encode_accelerator.cc', |
| 123 'gpu/android_video_encode_accelerator.h', | 123 'gpu/android_video_encode_accelerator.h', |
| 124 ], | 124 ], |
| 125 }], | 125 }], |
| 126 ['use_v4lplugin==1 and chromeos==1', { | 126 ['use_v4lplugin==1 and chromeos==1', { |
| 127 'direct_dependent_settings': { | |
|
wuchengli
2016/05/05 14:36:49
FYI. content_common.gypi depends on media.gyp:medi
| |
| 128 'defines': [ | |
| 129 'USE_LIBV4L2' | |
| 130 ], | |
| 131 }, | |
| 127 'defines': [ | 132 'defines': [ |
| 128 'USE_LIBV4L2' | 133 'USE_LIBV4L2' |
| 129 ], | 134 ], |
| 130 'variables': { | 135 'variables': { |
| 131 'generate_stubs_script': '../tools/generate_stubs/generate_stubs.py', | 136 'generate_stubs_script': '../tools/generate_stubs/generate_stubs.py', |
| 132 'extra_header': 'gpu/v4l2_stub_header.fragment', | 137 'extra_header': 'gpu/v4l2_stub_header.fragment', |
| 133 'sig_files': ['gpu/v4l2.sig'], | 138 'sig_files': ['gpu/v4l2.sig'], |
| 134 'outfile_type': 'posix_stubs', | 139 'outfile_type': 'posix_stubs', |
| 135 'stubs_filename_root': 'v4l2_stubs', | 140 'stubs_filename_root': 'v4l2_stubs', |
| 136 'project_path': 'media/gpu', | 141 'project_path': 'media/gpu', |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 354 'msvs_settings': { | 359 'msvs_settings': { |
| 355 'VCCLCompilerTool': { | 360 'VCCLCompilerTool': { |
| 356 'AdditionalOptions': [ | 361 'AdditionalOptions': [ |
| 357 '/wd4267', # Conversion from 'size_t' to 'type', possible loss of da ta | 362 '/wd4267', # Conversion from 'size_t' to 'type', possible loss of da ta |
| 358 ], | 363 ], |
| 359 }, | 364 }, |
| 360 }, | 365 }, |
| 361 }], | 366 }], |
| 362 ], | 367 ], |
| 363 } | 368 } |
| OLD | NEW |