| Index: content/content_common.gypi
|
| diff --git a/content/content_common.gypi b/content/content_common.gypi
|
| index 01873440518915a1bc2db8ec48012ab98a9fdb7c..f6356ea0e0ffb9acb7a8b3c237ceec38e2712f58 100644
|
| --- a/content/content_common.gypi
|
| +++ b/content/content_common.gypi
|
| @@ -762,7 +762,7 @@
|
| '<(DEPTH)/third_party/khronos',
|
| ],
|
| }],
|
| - ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
|
| + ['target_arch != "arm" and chromeos == 1', {
|
| 'dependencies': [
|
| '../media/media.gyp:media',
|
| '../third_party/libyuv/libyuv.gyp:libyuv',
|
| @@ -773,6 +773,8 @@
|
| 'common/gpu/media/va_surface.h',
|
| 'common/gpu/media/vaapi_h264_decoder.cc',
|
| 'common/gpu/media/vaapi_h264_decoder.h',
|
| + 'common/gpu/media/vaapi_picture_provider.cc',
|
| + 'common/gpu/media/vaapi_picture_provider.h',
|
| 'common/gpu/media/vaapi_video_decode_accelerator.cc',
|
| 'common/gpu/media/vaapi_video_decode_accelerator.h',
|
| 'common/gpu/media/vaapi_video_encode_accelerator.cc',
|
| @@ -780,10 +782,27 @@
|
| 'common/gpu/media/vaapi_wrapper.cc',
|
| 'common/gpu/media/vaapi_wrapper.h',
|
| ],
|
| + 'conditions': [
|
| + ['use_x11 == 1', {
|
| + 'variables': {
|
| + 'sig_files': [
|
| + 'common/gpu/media/va.sigs',
|
| + 'common/gpu/media/va_x11.sigs',
|
| + ],
|
| + },
|
| + }],
|
| + ['ozone_platform_gbm == 1', {
|
| + 'variables': {
|
| + 'sig_files': [
|
| + 'common/gpu/media/va.sigs',
|
| + 'common/gpu/media/va_drm.sigs',
|
| + ],
|
| + },
|
| + }],
|
| + ],
|
| 'variables': {
|
| 'generate_stubs_script': '../tools/generate_stubs/generate_stubs.py',
|
| 'extra_header': 'common/gpu/media/va_stub_header.fragment',
|
| - 'sig_files': ['common/gpu/media/va.sigs'],
|
| 'outfile_type': 'posix_stubs',
|
| 'stubs_filename_root': 'va_stubs',
|
| 'project_path': 'content/common/gpu/media',
|
|
|