Commit e2311613 authored by Brett Wilson's avatar Brett Wilson

Make mojo/services pass in "gn check"

This mostly just adds the missing dependency identified by the checker.

In some cases I looked at the target and added public_deps that I thought were appropriate given the nature of the target.

This renames the generated mojo action names to be foo__generator instead of foo_generator since it is not clear from the current name that it is an internally-generated target and I kept trying to use it. The double-underscore matches the Android generated targets.

In a few cases I changed ordering (sources come before deps in GN style) but I didn't want to make the changes difficult to diff so didn't do it for most cases.

R=darin@chromium.org

Review URL: https://codereview.chromium.org/581273003

Cr-Commit-Position: refs/heads/master@{#295797}
parent e9c06814
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
# gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings => //gpu/skia_bindings # gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings => //gpu/skia_bindings
component("gpu") { component("gpu") {
deps = [ public_deps = [
"//gpu/command_buffer/client", "//gpu/command_buffer/client",
"//gpu/command_buffer/client:gles2_cmd_helper_sources", "//gpu/command_buffer/client:gles2_cmd_helper_sources",
"//gpu/command_buffer/common", "//gpu/command_buffer/common",
...@@ -56,16 +56,15 @@ source_set("test_support") { ...@@ -56,16 +56,15 @@ source_set("test_support") {
"command_buffer/client/gles2_interface_stub.h", "command_buffer/client/gles2_interface_stub.h",
] ]
deps = [ public_deps = [
":gpu", ":gpu",
"//gpu/command_buffer/client:gles2_interface", "//gpu/command_buffer/client:gles2_interface",
]
deps = [
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
"//ui/gl:gl_unittest_utils", "//ui/gl:gl_unittest_utils",
] ]
forward_dependent_configs_from = [
"//gpu/command_buffer/client:gles2_interface",
]
} }
test("gl_tests") { test("gl_tests") {
......
...@@ -116,12 +116,14 @@ source_set("service") { ...@@ -116,12 +116,14 @@ source_set("service") {
"//third_party/khronos:khronos_headers", "//third_party/khronos:khronos_headers",
] ]
public_deps = [
"//gpu/command_buffer/common",
]
deps = [ deps = [
":disk_cache_proto", ":disk_cache_proto",
"//base", "//base",
"//base/third_party/dynamic_annotations", "//base/third_party/dynamic_annotations",
"//crypto", "//crypto",
"//gpu/command_buffer/common",
"//third_party/angle:translator", "//third_party/angle:translator",
"//third_party/protobuf:protobuf_lite", "//third_party/protobuf:protobuf_lite",
"//third_party/re2", "//third_party/re2",
......
...@@ -9,9 +9,12 @@ source_set("application") { ...@@ -9,9 +9,12 @@ source_set("application") {
"application_runner_chromium.h", "application_runner_chromium.h",
] ]
public_deps = [
"//mojo/public/cpp/application",
]
deps = [ deps = [
"//base",
"//mojo/common", "//mojo/common",
"//mojo/environment:chromium", "//mojo/environment:chromium",
"//mojo/public/cpp/application",
] ]
} }
...@@ -21,26 +21,31 @@ component("application_manager") { ...@@ -21,26 +21,31 @@ component("application_manager") {
"MOJO_APPLICATION_MANAGER_IMPLEMENTATION", "MOJO_APPLICATION_MANAGER_IMPLEMENTATION",
] ]
deps = [ public_deps = [
"//base", "//base",
"//mojo/common",
"//mojo/public/cpp/application",
"//mojo/public/interfaces/application:application",
"//mojo/services/public/interfaces/network:network",
"//url",
]
deps = [
"//base/third_party/dynamic_annotations", "//base/third_party/dynamic_annotations",
"//net", "//net",
"//url", "//url",
"//mojo/common",
"//mojo/environment:chromium", "//mojo/environment:chromium",
"//mojo/public/interfaces/application:application",
"//mojo/services/public/interfaces/content_handler:content_handler", "//mojo/services/public/interfaces/content_handler:content_handler",
"//mojo/services/public/interfaces/network:network",
"//mojo/system", "//mojo/system",
] ]
forward_dependent_configs_from = [
"//mojo/public/interfaces/application:application",
]
} }
# GYP version: mojo.gyp:mojo_application_manager_unittests # GYP version: mojo.gyp:mojo_application_manager_unittests
test("mojo_application_manager_unittests") { test("mojo_application_manager_unittests") {
sources = [
"application_manager_unittest.cc",
"background_shell_application_loader_unittest.cc",
]
deps = [ deps = [
":application_manager", ":application_manager",
":test_bindings", ":test_bindings",
...@@ -53,11 +58,6 @@ test("mojo_application_manager_unittests") { ...@@ -53,11 +58,6 @@ test("mojo_application_manager_unittests") {
"//testing/gtest", "//testing/gtest",
"//url", "//url",
] ]
sources = [
"application_manager_unittest.cc",
"background_shell_application_loader_unittest.cc",
]
} }
mojom("test_bindings") { mojom("test_bindings") {
......
...@@ -12,9 +12,12 @@ shared_library("mojo_js") { ...@@ -12,9 +12,12 @@ shared_library("mojo_js") {
deps = [ deps = [
":js", ":js",
"//base",
"//base:i18n", "//base:i18n",
"//gin",
"//mojo/application", "//mojo/application",
"//mojo/public/c/system:for_shared_library", "//mojo/public/c/system:for_shared_library",
"//mojo/public/cpp/application",
"//mojo/public/cpp/bindings", "//mojo/public/cpp/bindings",
"//mojo/public/cpp/utility", "//mojo/public/cpp/utility",
"//mojo/services/public/interfaces/content_handler", "//mojo/services/public/interfaces/content_handler",
...@@ -23,16 +26,19 @@ shared_library("mojo_js") { ...@@ -23,16 +26,19 @@ shared_library("mojo_js") {
# GYP version: part of mojo/mojo_apps.gypi:mojo_js_lib # GYP version: part of mojo/mojo_apps.gypi:mojo_js_lib
source_set("js") { source_set("js") {
sources = [
"mojo_runner_delegate.cc",
"mojo_runner_delegate.h",
]
public_deps = [
"//mojo/bindings/js",
]
deps = [ deps = [
"//base", "//base",
"//gin", "//gin",
"//mojo/apps/js/bindings", "//mojo/apps/js/bindings",
"//mojo/apps/js/bindings/gl", "//mojo/apps/js/bindings/gl",
"//mojo/bindings/js",
"//v8", "//v8",
] ]
sources = [
"mojo_runner_delegate.cc",
"mojo_runner_delegate.h",
]
} }
...@@ -4,20 +4,20 @@ ...@@ -4,20 +4,20 @@
# GYP version: part of mojo/mojo_apps.gypi:mojo_js_lib # GYP version: part of mojo/mojo_apps.gypi:mojo_js_lib
source_set("gl") { source_set("gl") {
sources = [
"context.cc",
"context.h",
"module.cc",
"module.h",
]
deps = [ deps = [
"//base", "//base",
"//gin", "//gin",
"//v8", "//v8",
"//mojo/bindings/js",
"//mojo/environment:chromium", "//mojo/environment:chromium",
"//mojo/public/gles2:for_shared_library", "//mojo/public/gles2:for_shared_library",
"//mojo/services/gles2:bindings", "//mojo/services/gles2:bindings",
] ]
sources = [
"context.cc",
"context.h",
"module.cc",
"module.h",
]
} }
...@@ -12,10 +12,8 @@ ...@@ -12,10 +12,8 @@
# List of source .mojom files to compile. # List of source .mojom files to compile.
# #
# deps (optional) # deps (optional)
# # public_deps (optional)
# visibility (optional) # visibility (optional)
# Normal meaning. However, this must be a list (normal visibility
# allows a single string).
template("mojom") { template("mojom") {
assert(defined(invoker.sources), assert(defined(invoker.sources),
"\"sources\" must be defined for the $target_name template.") "\"sources\" must be defined for the $target_name template.")
...@@ -85,7 +83,7 @@ template("mojom") { ...@@ -85,7 +83,7 @@ template("mojom") {
target_visibility = [ ":$target_name" ] target_visibility = [ ":$target_name" ]
} }
generator_target_name = target_name + "_generator" generator_target_name = target_name + "__generator"
action_foreach(generator_target_name) { action_foreach(generator_target_name) {
if (defined(invoker.visibility)) { if (defined(invoker.visibility)) {
visibility = target_visibility + invoker.visibility visibility = target_visibility + invoker.visibility
...@@ -118,5 +116,8 @@ template("mojom") { ...@@ -118,5 +116,8 @@ template("mojom") {
if (defined(invoker.deps)) { if (defined(invoker.deps)) {
deps += invoker.deps deps += invoker.deps
} }
if (defined(invoker.public_deps)) {
public_deps = invoker.public_deps
}
} }
} }
...@@ -6,9 +6,11 @@ ...@@ -6,9 +6,11 @@
component("clipboard") { component("clipboard") {
deps = [ deps = [
"//base", "//base",
"//mojo/application",
"//mojo/common", "//mojo/common",
"//mojo/environment:chromium", "//mojo/environment:chromium",
"//mojo/public/c/system:for_component", "//mojo/public/c/system:for_component",
"//mojo/public/cpp/bindings",
"//mojo/services/public/interfaces/clipboard", "//mojo/services/public/interfaces/clipboard",
"//ui/base", "//ui/base",
] ]
......
...@@ -6,8 +6,10 @@ import("//mojo/public/tools/bindings/mojom.gni") ...@@ -6,8 +6,10 @@ import("//mojo/public/tools/bindings/mojom.gni")
# GYP version: mojo/mojo_services.gypi:mojo_gles2_service # GYP version: mojo/mojo_services.gypi:mojo_gles2_service
source_set("gles2") { source_set("gles2") {
deps = [ public_deps = [
":bindings", ":bindings",
]
deps = [
"//base", "//base",
"//gpu/command_buffer/service", "//gpu/command_buffer/service",
"//ui/gfx", "//ui/gfx",
...@@ -37,8 +39,13 @@ source_set("bindings") { ...@@ -37,8 +39,13 @@ source_set("bindings") {
"mojo_buffer_backing.h", "mojo_buffer_backing.h",
] ]
deps = [ public_deps = [
":interfaces", ":interfaces",
]
deps = [
"//base",
"//gpu/command_buffer/common", "//gpu/command_buffer/common",
"//mojo/public/cpp/bindings",
"//mojo/services/gles2:interfaces",
] ]
} }
...@@ -47,6 +47,8 @@ shared_library("html_viewer") { ...@@ -47,6 +47,8 @@ shared_library("html_viewer") {
"//cc/blink", "//cc/blink",
"//cc/surfaces", "//cc/surfaces",
"//media", "//media",
"//media/audio",
"//media/base",
"//media/blink", "//media/blink",
"//mojo/cc", "//mojo/cc",
"//mojo/common", "//mojo/common",
...@@ -55,12 +57,15 @@ shared_library("html_viewer") { ...@@ -55,12 +57,15 @@ shared_library("html_viewer") {
"//mojo/public/cpp/bindings", "//mojo/public/cpp/bindings",
"//mojo/public/cpp/utility", "//mojo/public/cpp/utility",
"//mojo/services/public/cpp/view_manager", "//mojo/services/public/cpp/view_manager",
"//mojo/public/interfaces/application",
"//mojo/services/public/interfaces/clipboard", "//mojo/services/public/interfaces/clipboard",
"//mojo/services/public/interfaces/content_handler", "//mojo/services/public/interfaces/content_handler",
"//mojo/services/public/interfaces/gpu", "//mojo/services/public/interfaces/gpu",
"//mojo/services/public/interfaces/input_events:input_events",
"//mojo/services/public/interfaces/navigation", "//mojo/services/public/interfaces/navigation",
"//mojo/services/public/interfaces/network", "//mojo/services/public/interfaces/network",
"//mojo/services/public/interfaces/surfaces", "//mojo/services/public/interfaces/surfaces",
"//mojo/services/public/cpp/surfaces",
"//net", "//net",
"//skia", "//skia",
"//third_party/WebKit/public:blink", "//third_party/WebKit/public:blink",
......
...@@ -11,10 +11,12 @@ static_library("native_viewport") { ...@@ -11,10 +11,12 @@ static_library("native_viewport") {
deps = [ deps = [
"//base", "//base",
"//cc/surfaces", "//cc/surfaces",
"//gpu/command_buffer/service",
"//mojo/application", "//mojo/application",
"//mojo/common", "//mojo/common",
"//mojo/environment:chromium", "//mojo/environment:chromium",
"//mojo/services/gles2", "//mojo/services/gles2",
"//mojo/services/gles2:interfaces",
"//mojo/services/public/cpp/geometry", "//mojo/services/public/cpp/geometry",
"//mojo/services/public/cpp/input_events", "//mojo/services/public/cpp/input_events",
"//mojo/services/public/cpp/surfaces", "//mojo/services/public/cpp/surfaces",
...@@ -25,6 +27,8 @@ static_library("native_viewport") { ...@@ -25,6 +27,8 @@ static_library("native_viewport") {
"//ui/events/platform", "//ui/events/platform",
"//ui/gfx", "//ui/gfx",
"//ui/gfx/geometry", "//ui/gfx/geometry",
"//ui/gl",
"//ui/platform_window",
] ]
sources = [ sources = [
......
...@@ -8,7 +8,10 @@ shared_library("network") { ...@@ -8,7 +8,10 @@ shared_library("network") {
deps = [ deps = [
":lib", ":lib",
"//base",
"//mojo/application",
"//mojo/public/c/system:for_shared_library", "//mojo/public/c/system:for_shared_library",
"//mojo/public/cpp/bindings:bindings",
"//mojo/services/public/interfaces/network", "//mojo/services/public/interfaces/network",
] ]
......
...@@ -3,6 +3,17 @@ ...@@ -3,6 +3,17 @@
# found in the LICENSE file. # found in the LICENSE file.
component("input_events") { component("input_events") {
sources = [
"lib/input_events_type_converters.cc",
"lib/mojo_extended_key_event_data.cc",
"lib/mojo_extended_key_event_data.h",
"mojo_input_events_export.h",
]
defines = [
"MOJO_INPUT_EVENTS_IMPLEMENTATION",
]
deps = [ deps = [
"//base", "//base",
"//ui/events", "//ui/events",
...@@ -13,17 +24,4 @@ component("input_events") { ...@@ -13,17 +24,4 @@ component("input_events") {
"//mojo/services/public/interfaces/geometry", "//mojo/services/public/interfaces/geometry",
"//mojo/services/public/cpp/geometry", "//mojo/services/public/cpp/geometry",
] ]
defines = [
"MOJO_INPUT_EVENTS_IMPLEMENTATION",
]
sources = [
"lib/input_events_type_converters.cc",
"lib/input_events_type_converters.h",
"lib/mojo_extended_key_event_data.cc",
"lib/mojo_extended_key_event_data.h",
"input_events_type_converters.h",
"mojo_input_events_export.h",
]
} }
...@@ -6,32 +6,30 @@ ...@@ -6,32 +6,30 @@
component("surfaces") { component("surfaces") {
output_name = "mojo_surfaces_lib" output_name = "mojo_surfaces_lib"
sources = [
"lib/surfaces_type_converters.cc",
"lib/surfaces_utils.cc",
"mojo_surfaces_export.h",
"surfaces_type_converters.h",
"surfaces_utils.h",
]
defines = [ "MOJO_SURFACES_IMPLEMENTATION" ]
public_deps = [
"//mojo/services/public/cpp/geometry",
"//ui/gfx",
]
deps = [ deps = [
"//base", "//base",
"//cc", "//cc",
"//cc/surfaces", "//cc/surfaces",
"//ui/gfx", "//gpu",
"//ui/gfx/geometry", "//ui/gfx/geometry",
"//mojo/environment:chromium", "//mojo/environment:chromium",
"//mojo/public/c/system:for_component", "//mojo/public/c/system:for_component",
"//mojo/services/public/interfaces/surfaces:surface_id",
"//mojo/services/public/interfaces/surfaces", "//mojo/services/public/interfaces/surfaces",
"//mojo/services/public/cpp/geometry",
]
forward_dependent_configs_from = [
"//mojo/services/public/cpp/geometry",
"//ui/gfx",
]
defines = [
"MOJO_SURFACES_IMPLEMENTATION",
]
sources = [
"lib/surfaces_type_converters.cc",
"lib/surfaces_utils.cc",
"mojo_surfaces_export.h",
"surfaces_type_converters.h",
"surfaces_utils.h",
] ]
} }
...@@ -22,18 +22,25 @@ source_set("view_manager") { ...@@ -22,18 +22,25 @@ source_set("view_manager") {
"window_manager_delegate.h", "window_manager_delegate.h",
] ]
deps = [ public_deps = [
":common", ":common",
"//skia",
]
deps = [
"//base", "//base",
"//cc/surfaces", "//cc/surfaces",
"//gpu", "//gpu",
"//mojo/application", "//mojo/application",
"//mojo/public/cpp/bindings:bindings",
"//mojo/public/gles2:for_shared_library", "//mojo/public/gles2:for_shared_library",
"//mojo/public/interfaces/application", "//mojo/public/interfaces/application",
"//mojo/services/public/cpp/geometry", "//mojo/services/public/cpp/geometry",
"//mojo/services/public/cpp/surfaces", "//mojo/services/public/cpp/surfaces",
"//mojo/services/public/interfaces/geometry", "//mojo/services/public/interfaces/geometry",
"//mojo/services/public/interfaces/gpu", "//mojo/services/public/interfaces/gpu",
"//mojo/services/public/interfaces/input_events:input_events",
"//mojo/services/public/interfaces/surfaces:surface_id",
"//mojo/services/public/interfaces/surfaces:surfaces",
"//mojo/services/public/interfaces/view_manager", "//mojo/services/public/interfaces/view_manager",
"//mojo/services/public/interfaces/window_manager", "//mojo/services/public/interfaces/window_manager",
"//skia", "//skia",
...@@ -41,12 +48,13 @@ source_set("view_manager") { ...@@ -41,12 +48,13 @@ source_set("view_manager") {
"//ui/gfx", "//ui/gfx",
"//ui/gfx/geometry", "//ui/gfx/geometry",
] ]
forward_dependent_configs_from = [ "//skia" ]
} }
source_set("common") { source_set("common") {
sources = [ sources = [
"types.h" "types.h"
] ]
public_deps = [
"//base",
]
} }
...@@ -17,6 +17,7 @@ test("mojo_view_manager_lib_unittests") { ...@@ -17,6 +17,7 @@ test("mojo_view_manager_lib_unittests") {
"//testing/gtest", "//testing/gtest",
"//ui/gfx", "//ui/gfx",
"//ui/gfx:test_support", "//ui/gfx:test_support",
"//mojo/application_manager",
"//mojo/environment:chromium", "//mojo/environment:chromium",
"//mojo/services/public/interfaces/geometry", "//mojo/services/public/interfaces/geometry",
"//mojo/services/public/cpp/geometry", "//mojo/services/public/cpp/geometry",
......
...@@ -10,7 +10,7 @@ mojom("native_viewport") { ...@@ -10,7 +10,7 @@ mojom("native_viewport") {
"native_viewport.mojom", "native_viewport.mojom",
] ]
deps = [ public_deps = [
"//mojo/services/gles2:bindings", "//mojo/services/gles2:bindings",
"//mojo/services/public/interfaces/geometry", "//mojo/services/public/interfaces/geometry",
"//mojo/services/public/interfaces/gpu", "//mojo/services/public/interfaces/gpu",
......
...@@ -16,6 +16,7 @@ shared_library("surfaces") { ...@@ -16,6 +16,7 @@ shared_library("surfaces") {
"//mojo/environment:chromium", "//mojo/environment:chromium",
"//mojo/public/c/system:for_shared_library", "//mojo/public/c/system:for_shared_library",
"//mojo/public/gles2:for_shared_library", "//mojo/public/gles2:for_shared_library",
"//mojo/services/gles2:interfaces",
"//mojo/services/public/cpp/geometry", "//mojo/services/public/cpp/geometry",
"//mojo/services/public/cpp/surfaces", "//mojo/services/public/cpp/surfaces",
"//mojo/services/public/interfaces/geometry", "//mojo/services/public/interfaces/geometry",
......
...@@ -17,7 +17,9 @@ shared_library("mojo_test_app") { ...@@ -17,7 +17,9 @@ shared_library("mojo_test_app") {
deps = [ deps = [
":bindings", ":bindings",
"//base", "//base",
"//base:i18n",
"//mojo/public/c/system:for_shared_library", "//mojo/public/c/system:for_shared_library",
"//mojo/public/cpp/application",
"//mojo/public/cpp/application:standalone", "//mojo/public/cpp/application:standalone",
"//mojo/public/cpp/utility", "//mojo/public/cpp/utility",
] ]
...@@ -39,7 +41,9 @@ shared_library("mojo_test_request_tracker_app") { ...@@ -39,7 +41,9 @@ shared_library("mojo_test_request_tracker_app") {
deps = [ deps = [
":bindings", ":bindings",
"//base", "//base",
"//base:i18n",
"//mojo/public/c/system:for_shared_library", "//mojo/public/c/system:for_shared_library",
"//mojo/public/cpp/application",
"//mojo/public/cpp/application:standalone", "//mojo/public/cpp/application:standalone",
"//mojo/public/cpp/utility", "//mojo/public/cpp/utility",
] ]
......
...@@ -9,10 +9,8 @@ ...@@ -9,10 +9,8 @@
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "mojo/public/cpp/application/application_connection.h" #include "mojo/public/cpp/application/application_connection.h"
#include "mojo/services/test_service/test_request_tracker_client_impl.h" #include "mojo/services/test_service/test_request_tracker_client_impl.h"
#include "mojo/services/test_service/test_request_tracker_impl.h"
#include "mojo/services/test_service/test_service_application.h" #include "mojo/services/test_service/test_service_application.h"
#include "mojo/services/test_service/test_time_service_impl.h" #include "mojo/services/test_service/test_time_service_impl.h"
#include "url/gurl.h"
namespace mojo { namespace mojo {
namespace test { namespace test {
......
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
# GYP version: mojo/mojo_services.gypi:mojo_view_manager # GYP version: mojo/mojo_services.gypi:mojo_view_manager
component("view_manager") { component("view_manager") {
public_deps = [
"//mojo/services/public/cpp/view_manager:common",
]
deps = [ deps = [
"//base", "//base",
"//cc/surfaces", "//cc/surfaces",
...@@ -11,10 +14,11 @@ component("view_manager") { ...@@ -11,10 +14,11 @@ component("view_manager") {
"//mojo/common", "//mojo/common",
"//mojo/environment:chromium", "//mojo/environment:chromium",
"//mojo/public/c/system:for_component", "//mojo/public/c/system:for_component",
"//mojo/public/cpp/bindings",
"//mojo/public/interfaces/application",
"//mojo/services/public/cpp/geometry", "//mojo/services/public/cpp/geometry",
"//mojo/services/public/cpp/input_events", "//mojo/services/public/cpp/input_events",
"//mojo/services/public/cpp/surfaces", "//mojo/services/public/cpp/surfaces",
"//mojo/services/public/cpp/view_manager:common",
"//mojo/services/public/interfaces/geometry", "//mojo/services/public/interfaces/geometry",
"//mojo/services/public/interfaces/input_events", "//mojo/services/public/interfaces/input_events",
"//mojo/services/public/interfaces/native_viewport", "//mojo/services/public/interfaces/native_viewport",
...@@ -60,11 +64,13 @@ component("view_manager") { ...@@ -60,11 +64,13 @@ component("view_manager") {
# GYP version: mojo/mojo_services.gypi:mojo_view_manager_unittests # GYP version: mojo/mojo_services.gypi:mojo_view_manager_unittests
test("mojo_view_manager_unittests") { test("mojo_view_manager_unittests") {
deps = [ deps = [
":view_manager",
"//base", "//base",
"//base/test:test_support", "//base/test:test_support",
"//mojo/application", "//mojo/application",
"//mojo/application_manager", "//mojo/application_manager",
"//mojo/environment:chromium", "//mojo/environment:chromium",
"//mojo/public/cpp/bindings",
"//mojo/services/public/cpp/input_events", "//mojo/services/public/cpp/input_events",
"//mojo/services/public/cpp/geometry", "//mojo/services/public/cpp/geometry",
"//mojo/services/public/cpp/view_manager", "//mojo/services/public/cpp/view_manager",
...@@ -76,6 +82,7 @@ test("mojo_view_manager_unittests") { ...@@ -76,6 +82,7 @@ test("mojo_view_manager_unittests") {
"//mojo/shell:test_support", "//mojo/shell:test_support",
"//mojo/system", "//mojo/system",
"//testing/gtest", "//testing/gtest",
"//ui/gfx/geometry",
] ]
sources = [ sources = [
......
...@@ -12,10 +12,14 @@ shared_library("window_manager") { ...@@ -12,10 +12,14 @@ shared_library("window_manager") {
sources = [ "main.cc" ] sources = [ "main.cc" ]
deps = [ public_deps = [
":lib", ":lib",
]
deps = [
"//base",
"//mojo/application", "//mojo/application",
"//mojo/public/c/system:for_shared_library", "//mojo/public/c/system:for_shared_library",
"//mojo/services/public/cpp/view_manager",
] ]
} }
...@@ -28,22 +32,25 @@ source_set("lib") { ...@@ -28,22 +32,25 @@ source_set("lib") {
"window_manager_service_impl.h", "window_manager_service_impl.h",
] ]
public_deps = [
"//mojo/aura",
]
deps = [ deps = [
"//base", "//base",
"//mojo/application", "//mojo/application",
"//mojo/aura",
"//mojo/common", "//mojo/common",
"//mojo/environment:chromium", "//mojo/environment:chromium",
"//mojo/public/cpp/bindings",
"//mojo/services/public/cpp/input_events", "//mojo/services/public/cpp/input_events",
"//mojo/services/public/cpp/view_manager", "//mojo/services/public/cpp/view_manager",
"//mojo/services/public/interfaces/window_manager", "//mojo/services/public/interfaces/window_manager",
"//ui/aura",
"//ui/base", "//ui/base",
"//ui/events",
"//ui/gfx", "//ui/gfx",
"//ui/gfx/geometry", "//ui/gfx/geometry",
"//ui/wm", "//ui/wm",
] ]
forward_dependent_configs_from = [ "//mojo/aura" ]
} }
# GYP version: mojo/mojo_services.gypi:mojo_core_window_manager_unittests # GYP version: mojo/mojo_services.gypi:mojo_core_window_manager_unittests
......
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