| Index: ui/ozone/BUILD.gn
|
| diff --git a/ui/ozone/BUILD.gn b/ui/ozone/BUILD.gn
|
| index d5285798b5f0b19f7e4ce0124976434ef343c0cc..838542cbddbe4ec27acceb2898d29dcfa13de8b3 100644
|
| --- a/ui/ozone/BUILD.gn
|
| +++ b/ui/ozone/BUILD.gn
|
| @@ -76,7 +76,6 @@ component("ozone") {
|
| platform_list_cc_file,
|
| platform_list_h_file,
|
| constructor_list_cc_file,
|
| -
|
| "common/display_mode_proxy.cc",
|
| "common/display_mode_proxy.h",
|
| "common/display_snapshot_proxy.cc",
|
| @@ -102,24 +101,25 @@ component("ozone") {
|
|
|
| defines = [ "OZONE_IMPLEMENTATION" ]
|
|
|
| - deps = [
|
| - ":generate_constructor_list",
|
| - ":generate_ozone_platform_list",
|
| - ":ozone_base",
|
| - "//base",
|
| - "//ipc",
|
| - "//skia",
|
| - "//ui/display/types",
|
| - "//ui/display/util",
|
| - "//ui/events",
|
| - "//ui/events/ozone:events_ozone",
|
| - "//ui/gfx",
|
| - "//ui/gfx/geometry",
|
| - "//ui/gfx/ipc",
|
| - # TODO(GYP) the GYP version has a way to add additional dependencies via
|
| - # build flags.
|
| - ] + ozone_platform_deps
|
| -
|
| + deps =
|
| + [
|
| + ":generate_constructor_list",
|
| + ":generate_ozone_platform_list",
|
| + ":ozone_base",
|
| + "//base",
|
| + "//ipc",
|
| + "//skia",
|
| + "//ui/display/types",
|
| + "//ui/display/util",
|
| + "//ui/events",
|
| + "//ui/events/ozone:events_ozone",
|
| + "//ui/gfx",
|
| + "//ui/gfx/geometry",
|
| + "//ui/gfx/ipc",
|
| +
|
| + # TODO(GYP) the GYP version has a way to add additional dependencies via
|
| + # build flags.
|
| + ] + ozone_platform_deps
|
| }
|
|
|
| # GYP version: ui/ozone/ozone.gyp:generate_ozone_platform_list
|
| @@ -128,15 +128,16 @@ action("generate_ozone_platform_list") {
|
| outputs = [
|
| platform_list_cc_file,
|
| platform_list_h_file,
|
| - platform_list_txt_file
|
| + platform_list_txt_file,
|
| ]
|
|
|
| - args = [
|
| - "--output_cc=" + rebase_path(platform_list_cc_file, root_build_dir),
|
| - "--output_h=" + rebase_path(platform_list_h_file, root_build_dir),
|
| - "--output_txt=" + rebase_path(platform_list_txt_file, root_build_dir),
|
| - "--default=$ozone_platform",
|
| - ] + ozone_platforms
|
| + args =
|
| + [
|
| + "--output_cc=" + rebase_path(platform_list_cc_file, root_build_dir),
|
| + "--output_h=" + rebase_path(platform_list_h_file, root_build_dir),
|
| + "--output_txt=" + rebase_path(platform_list_txt_file, root_build_dir),
|
| + "--default=$ozone_platform",
|
| + ] + ozone_platforms
|
| }
|
|
|
| # GYP version: ui/ozone/ozone.gyp:generate_constructor_list
|
| @@ -146,9 +147,7 @@ action("generate_constructor_list") {
|
| inputs = [
|
| platform_list_txt_file,
|
| ]
|
| - outputs = [
|
| - constructor_list_cc_file,
|
| - ]
|
| + outputs = [ constructor_list_cc_file ]
|
|
|
| args = [
|
| "--platform_list=" + rebase_path(platform_list_txt_file, root_build_dir),
|
| @@ -158,7 +157,9 @@ action("generate_constructor_list") {
|
| "--include=\"ui/ozone/public/ozone_platform.h\"",
|
| ]
|
|
|
| - deps = [ ":generate_ozone_platform_list" ]
|
| + deps = [
|
| + ":generate_ozone_platform_list",
|
| + ]
|
| }
|
|
|
| test("ozone_unittests") {
|
| @@ -167,7 +168,7 @@ test("ozone_unittests") {
|
| ]
|
|
|
| deps = [
|
| - "//base/test:test_support",
|
| - "//testing/gtest",
|
| - ] + ozone_platform_test_deps
|
| + "//base/test:test_support",
|
| + "//testing/gtest",
|
| + ] + ozone_platform_test_deps
|
| }
|
|
|