Commit 37ff82b2 authored by Christopher Grant's avatar Christopher Grant Committed by Commit Bot

VR: Fix pixel tests missing dependency.

The /ui/android:ui_java dependency doesn't appear to propagate from the
test library to executable targets that need it, so explicitly include
ui_java in the Pixel tests as was done for unit tests.

BUG=

Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I943e24cc0230764c05857501ac3047e7c71b0970
Reviewed-on: https://chromium-review.googlesource.com/783150Reviewed-by: default avatarBrian Sheedy <bsheedy@chromium.org>
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Cr-Commit-Position: refs/heads/master@{#518403}
parent 218df7fc
......@@ -256,14 +256,11 @@ test("vr_common_unittests") {
deps = [
":vr_test_support",
"//cc:test_support",
"//mojo/common",
"//mojo/public/cpp/bindings",
"//testing/gmock",
"//ui/gfx:test_support",
"//ui/gfx/geometry",
]
if (is_android) {
deps += [ "//ui/android:ui_java" ]
}
......@@ -283,6 +280,9 @@ test("vr_pixeltests") {
":vr_gl_test_support",
":vr_test_support",
]
if (is_android) {
deps += [ "//ui/android:ui_java" ]
}
}
test("vr_common_perftests") {
......@@ -296,10 +296,6 @@ test("vr_common_perftests") {
"//testing/perf",
]
if (is_android) {
deps += [ "//ui/android:ui_java" ]
}
# Needed for isolate script to execute
data = [
"//testing/scripts/common.py",
......@@ -334,6 +330,7 @@ source_set("vr_test_support") {
":vr_common",
":vr_test_pak",
"//base/test:test_support",
"//cc:test_support",
"//components/security_state/core",
"//components/toolbar:vector_icons",
"//content/test:test_support",
......@@ -341,9 +338,13 @@ source_set("vr_test_support") {
"//skia",
"//testing/gtest",
"//ui/accessibility:ax_gen",
"//ui/gfx:test_support",
# TODO(mthiesse, crbug.com/769373): Remove dependency on device/vr:fakes.
"//device/vr:fakes",
# TODO(cjgrant): Figure out why including //ui/android:ui_java here
# doesn't propagate to individual test executable targets.
]
data = [
......
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