Commit be19d6d9 authored by Shawn Gallea's avatar Shawn Gallea Committed by Commit Bot

Move ash/cros files under is_chromeos

Moved ash files under is_chromeos for eventual
non-ChromeOS compilation.

Bug: 896710
Test: Built on ChromeOS.
Change-Id: Ic03a4b6ce9edab2ce5b5d0c50f2cce46bd96ae50
Reviewed-on: https://chromium-review.googlesource.com/c/1291778Reviewed-by: default avatarDaniele Castagna <dcastagna@chromium.org>
Reviewed-by: default avatarDaniel Nicoara <dnicoara@chromium.org>
Commit-Queue: Daniele Castagna <dcastagna@chromium.org>
Cr-Commit-Position: refs/heads/master@{#603154}
parent e48994eb
...@@ -38,7 +38,6 @@ source_set("wayland") { ...@@ -38,7 +38,6 @@ source_set("wayland") {
defines = [ "EXO_IMPLEMENTATION" ] defines = [ "EXO_IMPLEMENTATION" ]
deps = [ deps = [
"//ash/public/cpp",
"//base", "//base",
"//components/exo", "//components/exo",
"//components/exo/wayland/public:aura_shell_protocol", "//components/exo/wayland/public:aura_shell_protocol",
...@@ -80,7 +79,10 @@ source_set("wayland") { ...@@ -80,7 +79,10 @@ source_set("wayland") {
] ]
if (is_chromeos) { if (is_chromeos) {
deps += [ "//ui/events/ozone:events_ozone_layout" ] deps += [
"//ash/public/cpp",
"//ui/events/ozone:events_ozone_layout",
]
} }
} }
...@@ -320,8 +322,6 @@ executable("wayland_info_client") { ...@@ -320,8 +322,6 @@ executable("wayland_info_client") {
test("wayland_client_perftests") { test("wayland_client_perftests") {
sources = [ sources = [
"../../../ash/test/ash_test_suite.cc",
"../../../ash/test/ash_test_suite.h",
"clients/perftests.cc", "clients/perftests.cc",
"clients/test/run_all_client_perftests.cc", "clients/test/run_all_client_perftests.cc",
"clients/test/wayland_client_test.cc", "clients/test/wayland_client_test.cc",
...@@ -333,9 +333,6 @@ test("wayland_client_perftests") { ...@@ -333,9 +333,6 @@ test("wayland_client_perftests") {
":client_support", ":client_support",
":simple", ":simple",
":wayland", ":wayland",
"//ash",
"//ash:test_support_without_content",
"//ash/public/cpp",
"//base", "//base",
"//base/test:test_support", "//base/test:test_support",
"//cc:test_support", "//cc:test_support",
...@@ -352,11 +349,26 @@ test("wayland_client_perftests") { ...@@ -352,11 +349,26 @@ test("wayland_client_perftests") {
"//ui/wm", "//ui/wm",
] ]
data_deps = [ data_deps = []
"//ash/strings:ash_test_strings",
"//ash/resources:ash_test_resources_100_percent", if (is_chromeos) {
"//ash/resources:ash_test_resources_200_percent", sources += [
] "../../../ash/test/ash_test_suite.cc",
"../../../ash/test/ash_test_suite.h",
]
data_deps += [
"//ash/strings:ash_test_strings",
"//ash/resources:ash_test_resources_100_percent",
"//ash/resources:ash_test_resources_200_percent",
]
deps += [
"//ash",
"//ash:test_support_without_content",
"//ash/public/cpp",
]
}
} }
if (ozone_platform_gbm) { if (ozone_platform_gbm) {
......
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