From 1bd9da4e2c3bdbe923398089a80b82d9dc510c26 Mon Sep 17 00:00:00 2001 From: sky Date: Thu, 14 May 2015 12:21:48 -0700 Subject: [PATCH] Random mandoline gn fixes These were needed to get a clean build working. BUG=none TEST=none R=ben@chromium.org Review URL: https://codereview.chromium.org/1129193005 Cr-Commit-Position: refs/heads/master@{#329893} --- components/clipboard/BUILD.gn | 2 ++ mojo/runner/BUILD.gn | 1 + mojo/shell/BUILD.gn | 2 +- mojo/shell/native_runner.h | 4 ++-- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/components/clipboard/BUILD.gn b/components/clipboard/BUILD.gn index 6b064b661742..7440ae62c2fd 100644 --- a/components/clipboard/BUILD.gn +++ b/components/clipboard/BUILD.gn @@ -14,6 +14,8 @@ source_set("lib") { deps = [ "//components/clipboard/public/interfaces", + "//third_party/mojo/src/mojo/public/cpp/application", + "//third_party/mojo/src/mojo/public/cpp/bindings", ] } diff --git a/mojo/runner/BUILD.gn b/mojo/runner/BUILD.gn index 5d78611e1864..c06dd8c910dd 100644 --- a/mojo/runner/BUILD.gn +++ b/mojo/runner/BUILD.gn @@ -188,6 +188,7 @@ source_set("native_application_support") { "//base", "//mojo/gles2", "//mojo/platform_handle:defs", + "//mojo/shell", ] # This target has to include the public thunk headers, which generally diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn index 8e1988fc6499..66a8d750a3fd 100644 --- a/mojo/shell/BUILD.gn +++ b/mojo/shell/BUILD.gn @@ -33,6 +33,7 @@ source_set("shell") { public_deps = [ "//base", "//mojo/common", + "//third_party/mojo/src/mojo/public/cpp/bindings", "//third_party/mojo/src/mojo/public/interfaces/application:application", "//mojo/services/network/public/interfaces", "//url", @@ -45,7 +46,6 @@ source_set("shell") { "//mojo/environment:chromium", "//mojo/util:filename_util", "//third_party/mojo_services/src/content_handler/public/interfaces", - "//mojo/runner:native_application_support", ] } diff --git a/mojo/shell/native_runner.h b/mojo/shell/native_runner.h index 314f6b7a5930..8ceb5d53c546 100644 --- a/mojo/shell/native_runner.h +++ b/mojo/shell/native_runner.h @@ -7,8 +7,8 @@ #include "base/callback_forward.h" #include "base/memory/scoped_ptr.h" -#include "mojo/public/cpp/bindings/interface_request.h" -#include "mojo/public/interfaces/application/application.mojom.h" +#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" +#include "third_party/mojo/src/mojo/public/interfaces/application/application.mojom.h" #if defined(OS_WIN) #undef DELETE -- 2.11.4.GIT