Chromium Code Reviews| Index: content/content_common.gypi |
| diff --git a/content/content_common.gypi b/content/content_common.gypi |
| index b5ffcf3cc0cfec557795084a18bad6a4728869a9..bf16be1d4699fe412e7b9d6c32ce8f7494e24f5a 100644 |
| --- a/content/content_common.gypi |
| +++ b/content/content_common.gypi |
| @@ -753,7 +753,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', |
| @@ -771,10 +771,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_ozone.sigs', |
|
spang
2014/08/22 17:20:23
call this 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', |