Commit 8c316098 authored by pkotwicz's avatar pkotwicz Committed by Commit bot

Port video_decode_accelerator_unittest to GN for Android

BUG=510485

Review URL: https://codereview.chromium.org/1442473002

Cr-Commit-Position: refs/heads/master@{#361173}
parent 56c76b9d
...@@ -288,6 +288,7 @@ group("both_gn_and_gyp") { ...@@ -288,6 +288,7 @@ group("both_gn_and_gyp") {
"//components/user_manager", "//components/user_manager",
"//components/wallpaper", "//components/wallpaper",
"//content/shell/android:content_shell_apk", "//content/shell/android:content_shell_apk",
"//content/test:video_decode_accelerator_unittest",
# TODO(GYP): Are these needed, or will they be pulled in automatically? # TODO(GYP): Are these needed, or will they be pulled in automatically?
"//third_party/android_tools:android_gcm_java", "//third_party/android_tools:android_gcm_java",
......
...@@ -198,6 +198,7 @@ ...@@ -198,6 +198,7 @@
'../content/content_shell_and_tests.gyp:content_junit_tests', '../content/content_shell_and_tests.gyp:content_junit_tests',
'../content/content_shell_and_tests.gyp:content_shell_apk', '../content/content_shell_and_tests.gyp:content_shell_apk',
'../content/content_shell_and_tests.gyp:content_unittests_apk', '../content/content_shell_and_tests.gyp:content_unittests_apk',
'../content/content_shell_and_tests.gyp:video_decode_accelerator_unittest_apk',
'../device/device_tests.gyp:device_unittests_apk', '../device/device_tests.gyp:device_unittests_apk',
'../gpu/gpu.gyp:gpu_unittests_apk', '../gpu/gpu.gyp:gpu_unittests_apk',
'../media/media.gyp:media_unittests_apk', '../media/media.gyp:media_unittests_apk',
...@@ -765,7 +766,6 @@ ...@@ -765,7 +766,6 @@
'../components/components.gyp:cronet_perf_test_apk', '../components/components.gyp:cronet_perf_test_apk',
'../content/content_shell_and_tests.gyp:chromium_linker_test_apk', '../content/content_shell_and_tests.gyp:chromium_linker_test_apk',
'../content/content_shell_and_tests.gyp:content_shell_test_apk', '../content/content_shell_and_tests.gyp:content_shell_test_apk',
'../content/content_shell_and_tests.gyp:video_decode_accelerator_unittest_apk',
'../gpu/gpu.gyp:gl_tests_apk', '../gpu/gpu.gyp:gl_tests_apk',
'../gpu/gpu.gyp:gpu_perftests_apk', '../gpu/gpu.gyp:gpu_perftests_apk',
'../ipc/ipc.gyp:ipc_tests_apk', '../ipc/ipc.gyp:ipc_tests_apk',
......
...@@ -1658,6 +1658,8 @@ ...@@ -1658,6 +1658,8 @@
['chromeos==1 or OS=="win" or OS=="android"', { ['chromeos==1 or OS=="win" or OS=="android"', {
'targets': [ 'targets': [
{ {
# TODO(GYP): Port Windows and ChromeOS logic.
# GN: //content/test:video_decode_accelerator_unittest
'target_name': 'video_decode_accelerator_unittest', 'target_name': 'video_decode_accelerator_unittest',
'type': '<(gtest_target_type)', 'type': '<(gtest_target_type)',
'dependencies': [ 'dependencies': [
...@@ -2057,7 +2059,7 @@ ...@@ -2057,7 +2059,7 @@
'includes': [ '../build/jni_generator.gypi' ], 'includes': [ '../build/jni_generator.gypi' ],
}, },
{ {
# TODO(GN) # GN: //content/test:video_decode_accelerator_unittest_apk
'target_name': 'video_decode_accelerator_unittest_apk', 'target_name': 'video_decode_accelerator_unittest_apk',
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
......
...@@ -862,3 +862,46 @@ test("content_gl_benchmark") { ...@@ -862,3 +862,46 @@ test("content_gl_benchmark") {
"//ui/gl:test_support", "//ui/gl:test_support",
] ]
} }
if (is_android) {
# TODO(GYP): Port Windows and ChromeOS logic.
test("video_decode_accelerator_unittest") {
deps = [
"//base",
"//content",
"//media",
"//testing/gtest",
"//ui/base",
"//ui/gfx",
"//ui/gfx:test_support",
"//ui/gfx/geometry",
"//ui/gl",
"//ui/gl:test_support",
]
configs += [ "//third_party/khronos:khronos_headers" ]
sources = [
"//content/common/gpu/media/video_accelerator_unittest_helpers.h",
]
if (is_android) {
sources += [ "//content/common/gpu/media/android_video_decode_accelerator_unittest.cc" ]
} else {
sources += [
"//content/common/gpu/media/rendering_helper.cc",
"//content/common/gpu/media/rendering_helper.h",
"//content/common/gpu/media/video_decode_accelerator_unittest.cc",
]
}
if (is_android) {
deps += [
"//gpu:test_support",
"//media/base/android",
"//testing/gmock",
]
apk_deps = [
"//media/base/android:media_java",
"//ui/android:ui_java",
]
}
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment