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

Unified Diff: media/gpu/ipc/media_ipc.gyp

Issue 1882373004: Migrate content/common/gpu/media code to media/gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix several more bot-identified build issues 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
Index: media/gpu/ipc/media_ipc.gyp
diff --git a/media/gpu/ipc/media_ipc.gyp b/media/gpu/ipc/media_ipc.gyp
index e8d6b91a6865b4645a4225c65d8bc2e64715260b..34e85806a5cfadc743e5a632ff664a9037e55291 100644
--- a/media/gpu/ipc/media_ipc.gyp
+++ b/media/gpu/ipc/media_ipc.gyp
@@ -55,7 +55,52 @@
'client/gpu_video_encode_accelerator_host.h',
],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
- 'msvs_disabled_warnings': [4267, ],
+ 'msvs_disabled_warnings': [ 4267 ],
},
+ {
+ # GN version: //media/gpu/ipc/service
+ 'target_name': 'media_gpu_ipc_service',
+ 'type': 'static_library',
+ 'dependencies': [
+ '../../../base/base.gyp:base',
+ '../../../gpu/gpu.gyp:gpu_config',
+ '../../../gpu/gpu.gyp:gpu_ipc_service',
+ '../../../ipc/ipc.gyp:ipc',
+ '../../../third_party/mesa/mesa.gyp:mesa_headers',
+ '../../media.gyp:media',
+ '../../media.gyp:media_gpu',
+ 'media_gpu_ipc_common',
+ ],
+ 'sources': [
+ 'service/gpu_jpeg_decode_accelerator.cc',
+ 'service/gpu_jpeg_decode_accelerator.h',
+ 'service/gpu_video_decode_accelerator.cc',
+ 'service/gpu_video_decode_accelerator.h',
+ 'service/gpu_video_decode_accelerator_factory_impl.cc',
+ 'service/gpu_video_decode_accelerator_factory_impl.h',
+ 'service/gpu_video_encode_accelerator.cc',
+ 'service/gpu_video_encode_accelerator.h',
+ 'service/media_channel.cc',
+ 'service/media_channel.h',
+ 'service/media_service.cc',
+ 'service/media_service.h',
+ ],
+ 'include_dirs': [
+ '<(DEPTH)/third_party/libva',
+ '<(DEPTH)/third_party/mesa/src/include',
+ '<(SHARED_INTERMEDIATE_DIR)/vt_stubs',
+ ],
+ 'conditions': [
+ ['OS == "win" and target_arch == "x64"', {
+ 'msvs_settings': {
+ 'VCCLCompilerTool': {
+ 'AdditionalOptions': [
+ '/wd4267', # Conversion from 'size_t' to 'type', possible loss of data
+ ],
+ },
+ },
+ }],
+ ],
+ }
]
}

Powered by Google App Engine
This is Rietveld 408576698