Chromium Code Reviews| Index: content/content_common.gypi |
| diff --git a/content/content_common.gypi b/content/content_common.gypi |
| index 7920caabfa2d74216e1209b61c9bc4f230a34720..73c761ef2acc1b0cbd28eba63a61b880449835a1 100644 |
| --- a/content/content_common.gypi |
| +++ b/content/content_common.gypi |
| @@ -745,7 +745,7 @@ |
| '<(DEPTH)/third_party/khronos', |
| ], |
| }], |
| - ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', { |
| + ['target_arch != "arm" and chromeos == 1 and (use_x11 == 1 or ozone_platform_gbm == 1)', { |
| 'dependencies': [ |
| '../media/media.gyp:media', |
| '../third_party/libyuv/libyuv.gyp:libyuv', |
| @@ -756,17 +756,37 @@ |
| 'common/gpu/media/va_surface.h', |
| 'common/gpu/media/vaapi_h264_decoder.cc', |
| 'common/gpu/media/vaapi_h264_decoder.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', |
| - 'common/gpu/media/vaapi_video_encode_accelerator.h', |
| 'common/gpu/media/vaapi_wrapper.cc', |
| 'common/gpu/media/vaapi_wrapper.h', |
| ], |
| + 'conditions': [ |
| + [ 'use_x11 == 1', { |
|
scherkus (not reviewing)
2014/07/29 17:48:55
remove space between [ and '
vignatti (out of this project)
2014/07/30 21:51:30
Done.
|
| + 'variables': { |
| + 'extra_header': 'common/gpu/media/va_stub_header.fragment', |
| + 'sig_files': ['common/gpu/media/va.sigs'], |
| + }, |
| + 'sources': [ |
| + 'common/gpu/media/vaapi_video_decode_accelerator.cc', |
| + 'common/gpu/media/vaapi_video_decode_accelerator.h', |
| + 'common/gpu/media/vaapi_video_encode_accelerator.cc', |
| + 'common/gpu/media/vaapi_video_encode_accelerator.h', |
| + ] |
| + }], |
| + ['<(ozone_platform_gbm) == 1', { |
| + 'variables': { |
| + 'extra_header': 'common/gpu/media/va_drm_stub_header.fragment', |
| + 'sig_files': ['common/gpu/media/va_drm.sigs'], |
| + }, |
| + 'sources': [ |
| + 'common/gpu/media/media_ozone_platform_gbm.cc', |
| + 'common/gpu/media/media_ozone_platform_gbm.h', |
| + 'common/gpu/media/vaapi_video_decode_accelerator_drm.cc', |
| + 'common/gpu/media/vaapi_video_decode_accelerator_drm.h', |
| + ], |
| + }], |
| + ], |
| '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', |