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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content_tests.gypi

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
« no previous file with comments | « content/content_gpu.gypi ('k') | content/gpu/BUILD.gn » ('j') | media/gpu/h264_decoder.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index e69ad488a714a989bcf9e99fe75a27721041a0d7..885c6a61dd197c5b1a8ee7e93748ea06df638d18 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1656,184 +1656,6 @@
}],
],
}],
- ['chromeos==1 or OS=="win" or OS=="android"', {
- 'targets': [
- {
- # TODO(GYP): Port Windows and ChromeOS logic.
- # GN: //content/test: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/media.gyp:media',
- '../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',
- 'content.gyp:content',
- ],
- 'include_dirs': [
- '<(DEPTH)/third_party/khronos',
- ],
- 'sources': [
- 'common/gpu/media/android_video_decode_accelerator_unittest.cc',
- 'common/gpu/media/rendering_helper.cc',
- 'common/gpu/media/rendering_helper.h',
- 'common/gpu/media/video_accelerator_unittest_helpers.h',
- 'common/gpu/media/video_decode_accelerator_unittest.cc',
- ],
- 'conditions': [
- ['OS=="android"', {
- 'sources/': [
- ['exclude', '^common/gpu/media/rendering_helper.h'],
- ['exclude', '^common/gpu/media/rendering_helper.cc'],
- ['exclude', '^common/gpu/media/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', '^common/gpu/media/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, ],
- },
- ]
- }],
- ['chromeos==1 and target_arch != "arm"', {
- 'targets': [
- {
- 'target_name': 'vaapi_jpeg_decoder_unittest',
- 'type': '<(gtest_target_type)',
- 'dependencies': [
- 'content.gyp:content_common',
- '../base/base.gyp:base',
- '../media/media.gyp:media',
- '../media/media.gyp:media_test_support',
- '../testing/gtest.gyp:gtest',
- ],
- 'sources': [
- 'common/gpu/media/vaapi_jpeg_decoder_unittest.cc',
- ],
- 'include_dirs': [
- '<(DEPTH)/third_party/libva',
- ],
- 'conditions': [
- ['use_x11==1', {
- 'dependencies': [
- '../build/linux/system.gyp:x11',
- ]
- }, {
- 'dependencies': [
- '../build/linux/system.gyp:libdrm',
- ]
- }],
- ],
- }
- ]
- }],
- ['chromeos==1 or OS=="mac"', {
- 'targets': [
- {
- 'target_name': 'video_encode_accelerator_unittest',
- 'type': 'executable',
- 'dependencies': [
- 'content.gyp:content_common',
- '../base/base.gyp:base',
- '../media/media.gyp:media',
- '../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',
- 'content.gyp:content',
- ],
- 'sources': [
- 'common/gpu/media/video_accelerator_unittest_helpers.h',
- 'common/gpu/media/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', {
- 'targets': [
- {
- 'target_name': 'jpeg_decode_accelerator_unittest',
- 'type': 'executable',
- 'dependencies': [
- '../base/base.gyp:base',
- '../media/media.gyp:media',
- '../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',
- 'content.gyp:content',
- ],
- 'sources': [
- 'common/gpu/media/jpeg_decode_accelerator_unittest.cc',
- ],
- 'include_dirs': [
- '<(DEPTH)/third_party/libva',
- '<(DEPTH)/third_party/libyuv',
- ],
- }
- ]
- }],
['OS == "android"', {
'targets': [
{
@@ -2059,18 +1881,6 @@
'includes': [ '../build/jni_generator.gypi' ],
},
{
- # GN: //content/test:video_decode_accelerator_unittest_apk
- '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' ],
- },
- {
# GN: //content/public/test/android:test_support_content_jni_headers
'target_name': 'test_support_content_jni_headers',
'type': 'none',
« no previous file with comments | « content/content_gpu.gypi ('k') | content/gpu/BUILD.gn » ('j') | media/gpu/h264_decoder.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698