Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1181)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/media.gyp

Issue 1939683002: Test X11 header pollution (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/gpu/vt_video_encode_accelerator_mac.cc ('k') | media/media_gpu.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 7681aca7a55213d4144e158d0f9fa0176cd66195..9c03efa9a0f714bd90389202f17eefc498815f78 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1618,6 +1618,12 @@
}],
],
},
+ {
+ # GN version: //media/gpu
+ 'target_name': 'media_gpu',
+ 'type': 'static_library',
+ 'includes': [ 'media_gpu.gypi' ],
+ },
],
'conditions': [
['target_arch=="ia32" or target_arch=="x64"', {
@@ -2084,5 +2090,200 @@
},
],
}],
+ ['chromeos==1', {
+ 'targets': [
+ {
+ 'target_name': 'jpeg_decode_accelerator_unittest',
+ 'type': 'executable',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../media/media.gyp:media',
+ '../media/media.gyp:media_gpu',
+ '../media/media.gyp:media_test_support',
+ '../testing/gtest.gyp:gtest',
+ '../third_party/libyuv/libyuv.gyp:libyuv',
+ '../ui/gfx/gfx.gyp:gfx',
+ '../ui/gfx/gfx.gyp:gfx_geometry',
+ '../ui/gl/gl.gyp:gl',
+ '../ui/gl/gl.gyp:gl_test_support',
+ ],
+ 'sources': [
+ 'gpu/jpeg_decode_accelerator_unittest.cc',
+ ],
+ 'include_dirs': [
+ '<(DEPTH)/third_party/libva',
+ '<(DEPTH)/third_party/libyuv',
+ ],
+ }
+ ]
+ }],
+ ['chromeos==1 or OS=="mac"', {
+ 'targets': [
+ {
+ 'target_name': 'video_encode_accelerator_unittest',
+ 'type': 'executable',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../media/media.gyp:media',
+ '../media/media.gyp:media_gpu',
+ '../media/media.gyp:media_test_support',
+ '../testing/gtest.gyp:gtest',
+ '../ui/base/ui_base.gyp:ui_base',
+ '../ui/gfx/gfx.gyp:gfx',
+ '../ui/gfx/gfx.gyp:gfx_geometry',
+ '../ui/gfx/gfx.gyp:gfx_test_support',
+ '../ui/gl/gl.gyp:gl',
+ '../ui/gl/gl.gyp:gl_test_support',
+ ],
+ 'sources': [
+ 'gpu/video_accelerator_unittest_helpers.h',
+ 'gpu/video_encode_accelerator_unittest.cc',
+ ],
+ 'include_dirs': [
+ '<(DEPTH)/third_party/libva',
+ '<(DEPTH)/third_party/libyuv',
+ ],
+ 'conditions': [
+ ['use_x11==1', {
+ 'dependencies': [
+ '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
+ ],
+ }],
+ ['use_ozone==1', {
+ 'dependencies': [
+ '../ui/ozone/ozone.gyp:ozone',
+ ],
+ }],
+ ],
+ }
+ ]
+ }],
+ ['chromeos==1 or OS=="win" or OS=="android"', {
+ 'targets': [
+ {
+ # TODO(GYP): Port Windows and ChromeOS logic.
+ # GN: //media/gpu:video_decode_accelerator_unittest
+ 'target_name': 'video_decode_accelerator_unittest',
+ 'type': '<(gtest_target_type)',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../gpu/gpu.gyp:command_buffer_service',
+ '../media/gpu/ipc/media_ipc.gyp:media_gpu_ipc_service',
+ '../media/media.gyp:media',
+ '../media/media.gyp:media_gpu',
+ '../testing/gtest.gyp:gtest',
+ '../ui/base/ui_base.gyp:ui_base',
+ '../ui/gfx/gfx.gyp:gfx',
+ '../ui/gfx/gfx.gyp:gfx_geometry',
+ '../ui/gfx/gfx.gyp:gfx_test_support',
+ '../ui/gl/gl.gyp:gl',
+ '../ui/gl/gl.gyp:gl_test_support',
+ ],
+ 'include_dirs': [
+ '<(DEPTH)/third_party/khronos',
+ ],
+ 'sources': [
+ 'gpu/android_video_decode_accelerator_unittest.cc',
+ 'gpu/rendering_helper.cc',
+ 'gpu/rendering_helper.h',
+ 'gpu/video_accelerator_unittest_helpers.h',
+ 'gpu/video_decode_accelerator_unittest.cc',
+ ],
+ 'conditions': [
+ ['OS=="android"', {
+ 'sources/': [
+ ['exclude', '^gpu/rendering_helper.h'],
+ ['exclude', '^gpu/rendering_helper.cc'],
+ ['exclude', '^gpu/video_decode_accelerator_unittest.cc'],
+ ],
+ 'dependencies': [
+ '../media/media.gyp:player_android',
+ '../testing/gmock.gyp:gmock',
+ '../testing/android/native_test.gyp:native_test_native_code',
+ '../gpu/gpu.gyp:gpu_unittest_utils',
+ ],
+ }, { # OS!="android"
+ 'sources/': [
+ ['exclude', '^gpu/android_video_decode_accelerator_unittest.cc'],
+ ],
+ }],
+ ['OS=="win"', {
+ 'dependencies': [
+ '<(angle_path)/src/angle.gyp:libEGL',
+ '<(angle_path)/src/angle.gyp:libGLESv2',
+ ],
+ }],
+ ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', {
+ 'include_dirs': [
+ '<(DEPTH)/third_party/libva',
+ ],
+ }],
+ ['use_x11==1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:x11', # Used by rendering_helper.cc
+ '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
+ ],
+ }],
+ ['use_ozone==1 and chromeos==1', {
+ 'dependencies': [
+ '../ui/display/display.gyp:display', # Used by rendering_helper.cc
+ '../ui/ozone/ozone.gyp:ozone', # Used by rendering_helper.cc
+ ],
+ }],
+ ],
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ 'msvs_disabled_warnings': [ 4267 ],
+ },
+ ],
+ }],
+ ['OS=="android"', {
+ 'targets': [
+ {
+ 'target_name': 'video_decode_accelerator_unittest_apk',
+ 'type': 'none',
+ 'dependencies': [
+ 'video_decode_accelerator_unittest',
+ ],
+ 'variables': {
+ 'test_suite_name': 'video_decode_accelerator_unittest',
+ },
+ 'includes': [ '../build/apk_test.gypi' ],
+ },
+ ],
+ }],
+
+ ['chromeos==1 and target_arch != "arm"', {
+ 'targets': [
+ {
+ 'target_name': 'vaapi_jpeg_decoder_unittest',
+ 'type': '<(gtest_target_type)',
+ 'dependencies': [
+ '../media/media.gyp:media_gpu',
+ '../base/base.gyp:base',
+ '../media/media.gyp:media',
+ '../media/media.gyp:media_test_support',
+ '../testing/gtest.gyp:gtest',
+ ],
+ 'sources': [
+ 'gpu/vaapi_jpeg_decoder_unittest.cc',
+ ],
+ 'include_dirs': [
+ '<(DEPTH)/third_party/libva',
+ ],
+ 'conditions': [
+ ['use_x11==1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:x11',
+ '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
+ ]
+ }, {
+ 'dependencies': [
+ '../build/linux/system.gyp:libdrm',
+ ]
+ }],
+ ],
+ }
+ ]
+ }],
],
}
« no previous file with comments | « media/gpu/vt_video_encode_accelerator_mac.cc ('k') | media/media_gpu.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698