Commit fbd2fea9 authored by Sergey Ulanov's avatar Sergey Ulanov Committed by Commit Bot

Build gl_unittests and ui_base_unittests on Fuchsia

gl_unittests and ui_base_unittests should compile on Fuchsia now

Bug: 740608
Change-Id: Ie2a15c3ed42578a063f2f6e349b61902b9551966
Reviewed-on: https://chromium-review.googlesource.com/566993
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486568}
parent 8efa3b7d
...@@ -74,6 +74,7 @@ group("gn_all") { ...@@ -74,6 +74,7 @@ group("gn_all") {
"//skia:skia_unittests", "//skia:skia_unittests",
"//sql:sql_unittests", "//sql:sql_unittests",
"//tools/ipc_fuzzer:ipc_fuzzer_all", "//tools/ipc_fuzzer:ipc_fuzzer_all",
"//ui/base:ui_base_unittests",
"//url:url_unittests", "//url:url_unittests",
] ]
...@@ -90,7 +91,6 @@ group("gn_all") { ...@@ -90,7 +91,6 @@ group("gn_all") {
"//services:services_unittests", "//services:services_unittests",
"//services/service_manager/public/cpp", "//services/service_manager/public/cpp",
"//tools/metrics:metrics_metadata", "//tools/metrics:metrics_metadata",
"//ui/base:ui_base_unittests",
"//ui/gfx:gfx_unittests", "//ui/gfx:gfx_unittests",
] ]
} }
...@@ -155,6 +155,17 @@ group("gn_all") { ...@@ -155,6 +155,17 @@ group("gn_all") {
] ]
} }
if (!is_ios) {
deps += [
"//mojo",
"//mojo/common:mojo_common_unittests",
"//mojo/edk/system:mojo_system_unittests",
"//mojo/edk/test:mojo_public_bindings_unittests",
"//mojo/edk/test:mojo_public_system_unittests",
"//ui/gl:gl_unittests",
]
}
if (!is_ios && !is_fuchsia) { if (!is_ios && !is_fuchsia) {
deps += [ deps += [
"//cc:cc_unittests", "//cc:cc_unittests",
...@@ -198,7 +209,6 @@ group("gn_all") { ...@@ -198,7 +209,6 @@ group("gn_all") {
"//tools/imagediff($host_toolchain)", "//tools/imagediff($host_toolchain)",
"//ui/display:display_unittests", "//ui/display:display_unittests",
"//ui/events:events_unittests", "//ui/events:events_unittests",
"//ui/gl:gl_unittests",
"//ui/latency:latency_unittests", "//ui/latency:latency_unittests",
"//ui/touch_selection:ui_touch_selection_unittests", "//ui/touch_selection:ui_touch_selection_unittests",
"//url/ipc:url_ipc_unittests", "//url/ipc:url_ipc_unittests",
......
...@@ -11141,8 +11141,14 @@ ...@@ -11141,8 +11141,14 @@
"Fuchsia": { "Fuchsia": {
"additional_compile_targets": [ "additional_compile_targets": [
"d8", "d8",
"gl_unittests",
"mojo_common_unittests",
"mojo_public_bindings_unittests",
"mojo_public_system_unittests",
"mojo_system_unittests",
"net_unittests", "net_unittests",
"skia_unittests" "skia_unittests",
"ui_base_unittests"
], ],
"gtest_tests": [ "gtest_tests": [
{ {
...@@ -11168,8 +11174,14 @@ ...@@ -11168,8 +11174,14 @@
"Fuchsia (dbg)": { "Fuchsia (dbg)": {
"additional_compile_targets": [ "additional_compile_targets": [
"d8", "d8",
"gl_unittests",
"mojo_common_unittests",
"mojo_public_bindings_unittests",
"mojo_public_system_unittests",
"mojo_system_unittests",
"net_unittests", "net_unittests",
"skia_unittests" "skia_unittests",
"ui_base_unittests"
], ],
"gtest_tests": [ "gtest_tests": [
{ {
......
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