From 22fe91d3732cc46b9782792384bced33ffeee480 Mon Sep 17 00:00:00 2001 From: "jamesr@chromium.org" Date: Tue, 12 Aug 2014 17:07:12 +0000 Subject: GN: Make content_shell and webkit_unit_tests work in component build Except for webrtc, this produces content_shell and webkit_unit_tests binaries that link and run successfully on linux. R=brettw@chromium.org Review URL: https://codereview.chromium.org/462983002 Cr-Commit-Position: refs/heads/master@{#289007} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289007 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/base/BUILD.gn | 1 + ui/events/BUILD.gn | 30 +++++++++++++++++------------- ui/gfx/BUILD.gn | 2 ++ ui/wm/BUILD.gn | 1 + 4 files changed, 21 insertions(+), 13 deletions(-) (limited to 'ui') diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn index 76dcaa4..cd68336 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn @@ -289,6 +289,7 @@ component("base") { "//net", "//skia", "//third_party/icu", + "//ui/events/platform", "//ui/events:events_base", "//ui/resources", "//ui/strings", diff --git a/ui/events/BUILD.gn b/ui/events/BUILD.gn index 7a868b1..97ed855 100644 --- a/ui/events/BUILD.gn +++ b/ui/events/BUILD.gn @@ -239,9 +239,10 @@ source_set("test_support") { deps = [ "//base", "//skia", + "//ui/events/platform", "//ui/gfx/geometry", - ":events_base", ":events", + ":events_base", ":gesture_detection", ] @@ -281,8 +282,23 @@ test("events_unittests") { "x/events_x_unittest.cc", ] + deps = [ + ":dom4_keycode_converter", + ":events", + ":events_base", + ":gesture_detection", + ":test_support", + "//base", + "//base/test:run_all_unittests", + "//skia", + "//testing/gtest", + "//ui/events/platform", + "//ui/gfx:test_support", + ] + if (use_x11) { configs += [ "//build/config/linux:x11" ] + deps += [ "//ui/gfx/x" ] } else { sources -= [ "x/events_x_unittest.cc", @@ -301,16 +317,4 @@ test("events_unittests") { "gestures/gesture_provider_aura_unittest.cc", ] } - - deps = [ - ":events", - ":events_base", - ":gesture_detection", - ":test_support", - "//base", - "//base/test:run_all_unittests", - "//skia", - "//testing/gtest", - "//ui/gfx:test_support", - ] } diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn index c23fb16..08a8dd3 100644 --- a/ui/gfx/BUILD.gn +++ b/ui/gfx/BUILD.gn @@ -371,10 +371,12 @@ source_set("test_support") { ] deps = [ + ":gfx", "//base", "//base/test:test_support", "//skia", "//testing/gtest", + "//ui/gfx/geometry", ] if (is_ios) { diff --git a/ui/wm/BUILD.gn b/ui/wm/BUILD.gn index def5803..30b1c2e 100644 --- a/ui/wm/BUILD.gn +++ b/ui/wm/BUILD.gn @@ -79,6 +79,7 @@ component("wm") { "//ui/base", "//ui/compositor", "//ui/events", + "//ui/events/platform", "//ui/events:events_base", "//ui/events/platform", "//ui/gfx", -- cgit v1.1