Commit 1e0c32df authored by Thomas Anderson's avatar Thomas Anderson Committed by Commit Bot

Revert "Enable device/vr unittests on non-Android platforms"

This reverts commit 11ee8e61.

Reason for revert: Suspected causing build failure on WebKit Win Builder (dbg)
https://ci.chromium.org/buildbot/chromium.webkit/WebKit%20Win%20Builder%20%28dbg%29/131035

Original change's description:
> Enable device/vr unittests on non-Android platforms
> 
> Change-Id: I76eed7cf354d7f55e5409035941b76100d772b96
> Reviewed-on: https://chromium-review.googlesource.com/1053093
> Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
> Commit-Queue: Bill Orr <billorr@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#557320}

TBR=mthiesse@chromium.org,billorr@chromium.org

Change-Id: Ice684f6a36892c3b73c789617d40718a40d01745
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/1053153Reviewed-by: default avatarThomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557346}
parent 07316673
...@@ -283,7 +283,7 @@ test("device_unittests") { ...@@ -283,7 +283,7 @@ test("device_unittests") {
] ]
} }
if (enable_vr) { if (enable_vr && is_android) {
sources += [ sources += [
"vr/orientation/orientation_device_provider_unittest.cc", "vr/orientation/orientation_device_provider_unittest.cc",
"vr/orientation/orientation_device_unittest.cc", "vr/orientation/orientation_device_unittest.cc",
...@@ -291,13 +291,10 @@ test("device_unittests") { ...@@ -291,13 +291,10 @@ test("device_unittests") {
"vr/vr_display_impl_unittest.cc", "vr/vr_display_impl_unittest.cc",
] ]
if (is_android) {
deps += [ "//device/vr:java" ]
}
deps += [ deps += [
"//device/vr", "//device/vr",
"//device/vr:fakes", "//device/vr:fakes",
"//device/vr:java",
"//device/vr/public/mojom", "//device/vr/public/mojom",
"//services/device/public/cpp/generic_sensor", "//services/device/public/cpp/generic_sensor",
"//ui/display", "//ui/display",
......
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