diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-15 00:19:00 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-15 00:19:00 +0000 |
commit | a96654fc11da862433a1e4be225a264b2d79ed98 (patch) | |
tree | 286e9773fa53dbcb0a9417ba6e471ca4117b942a /ui | |
parent | bd940d99f0858a783b003cce8ab3733070c26880 (diff) | |
download | chromium_src-a96654fc11da862433a1e4be225a264b2d79ed98.zip chromium_src-a96654fc11da862433a1e4be225a264b2d79ed98.tar.gz chromium_src-a96654fc11da862433a1e4be225a264b2d79ed98.tar.bz2 |
ui/aura: Reenable the build of demo, bench and unittests targets.
The issue with ui/events was fixed in
https://src.chromium.org/viewvc/chrome?revision=288663&view=revision by
tapted, so it should allow us to enable and build this targets in GN
build again.
BUG=None
TEST=gn gen out/Debug_gn && ninja -C out/Debug ui/aura:demo
ui/aura:bench ui/aura:unittests
R=brettw@chromium.org,ben@chromium.org
Review URL: https://codereview.chromium.org/468743002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r-- | ui/aura/BUILD.gn | 186 |
1 files changed, 90 insertions, 96 deletions
diff --git a/ui/aura/BUILD.gn b/ui/aura/BUILD.gn index 6395c56..7f4c9c4 100644 --- a/ui/aura/BUILD.gn +++ b/ui/aura/BUILD.gn @@ -206,101 +206,95 @@ source_set("test_support") { } } -#TODO(GYP): Enable this when everything it depends links. -#executable("aura_demo") { -# sources = [ -# "demo/demo_main.cc", -# ] -# -# deps = [ -# ":aura", -# ":test_support", -# "//base", -# "//base:i18n", -# "//skia", -# "//third_party/icu", -# "//ui/base", -# "//ui/compositor", -# "//ui/compositor:test_support", -# "//ui/events", -# "//ui/gfx", -# "//ui/gfx/geometry", -# ] -# -# if (use_x11) { -# deps += [ -# "//ui/gfx/x", -# ] -# } -#} +executable("demo") { + output_name = "aura_demo" + sources = [ + "demo/demo_main.cc", + ] + + deps = [ + ":aura", + ":test_support", + "//base", + "//base:i18n", + "//skia", + "//third_party/icu", + "//ui/base", + "//ui/compositor", + "//ui/compositor:test_support", + "//ui/events", + "//ui/gfx", + "//ui/gfx/geometry", + ] + + if (use_x11) { + deps += [ + "//ui/gfx/x", + ] + } +} -#TODO(GYP): Enable this when everything it depends links. -#executable("aura_bench") { -# sources = [ -# "bench/bench_main.cc", -# ] -# -# deps = [ -# ":aura", -# ":test_support", -# "//base", -# "//base:i18n", -# "//cc", -# "//skia", -# "//third_party/icu", -# "//ui/base", -# "//ui/compositor", -# "//ui/compositor:test_support", -# "//ui/events", -# "//ui/gfx", -# "//ui/gfx/geometry", -# ] -# -# if (use_x11) { -# deps += [ -# "//ui/gfx/x", -# ] -# } -#} +executable("bench") { + output_name = "aura_bench" + sources = [ + "bench/bench_main.cc", + ] -#TODO(GYP): Enable this when everything it depends links. -#test("aura_unittests") { -# sources = [ -# "gestures/gesture_recognizer_unittest.cc", -# "test/run_all_unittests.cc", -# "window_event_dispatcher_unittest.cc", -# "window_targeter_unittest.cc", -# "window_unittest.cc", -# ] -# -# deps = [ -# ":aura", -# ":test_support", -# "//base/test:test_support", -# "//skia", -# "//testing/gtest", -# "//ui/base", -# "//ui/base:test_support", -# "//ui/compositor", -# "//ui/compositor:test_support", -# "//ui/events", -# "//ui/events:events_base", -# "//ui/events:gesture_detection", -# "//ui/gfx", -# "//ui/gfx/geometry", -# "//ui/gl", -# ] -# -# if (is_linux) { -# deps += [ -# "<(DEPTH)/third_party/mesa/mesa.gyp:osmesa", -# ] -# } -# -# if (is_linux) { # && use_allocator != "none") { -# deps += [ -# # See http://crbug.com/162998#c4 for why this is needed. -# "//base/allocator", -# ] -# } -#} + deps = [ + ":aura", + ":test_support", + "//base", + "//base:i18n", + "//cc", + "//skia", + "//third_party/icu", + "//ui/base", + "//ui/compositor", + "//ui/compositor:test_support", + "//ui/events", + "//ui/gfx", + "//ui/gfx/geometry", + ] + + if (use_x11) { + deps += [ + "//ui/gfx/x", + ] + } +} + +test("unittests") { + output_name = "aura_unittests" + sources = [ + "gestures/gesture_recognizer_unittest.cc", + "test/run_all_unittests.cc", + "window_event_dispatcher_unittest.cc", + "window_targeter_unittest.cc", + "window_unittest.cc", + ] + + deps = [ + ":aura", + ":test_support", + "//base/allocator", + "//base/test:test_support", + "//skia", + "//testing/gtest", + "//ui/base", + "//ui/base:test_support", + "//ui/compositor", + "//ui/compositor:test_support", + "//ui/events", + "//ui/events:events_base", + "//ui/events:gesture_detection", + "//ui/gfx", + "//ui/gfx/geometry", + "//ui/gl", + ] + + if (is_linux) { + deps += [ + "//third_party/mesa", + ] + } +} |