Index: ui/views/BUILD.gn |
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn |
index fd9d74a286edc545f2de538785397660cb87239b..39193496d1c22c797a09e6203c144b0822593587 100644 |
--- a/ui/views/BUILD.gn |
+++ b/ui/views/BUILD.gn |
@@ -5,11 +5,10 @@ |
import("//build/config/features.gni") |
import("//build/config/ui.gni") |
-gypi_values = exec_script( |
- "//build/gypi_to_gn.py", |
- [ rebase_path("views.gyp") ], |
- "scope", |
- [ "views.gyp" ]) |
+gypi_values = exec_script("//build/gypi_to_gn.py", |
+ [ rebase_path("views.gyp") ], |
+ "scope", |
+ [ "views.gyp" ]) |
component("views") { |
sources = gypi_values.views_sources |
@@ -48,7 +47,10 @@ component("views") { |
if (is_win) { |
sources += gypi_values.views_win_sources |
cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
- libs = [ "imm32.lib", "oleacc.lib" ] |
+ libs = [ |
+ "imm32.lib", |
+ "oleacc.lib", |
+ ] |
ldflags = [ "/DELAYLOAD:user32.dll" ] |
deps += [ |
"//third_party/iaccessible2", |
@@ -76,116 +78,113 @@ component("views") { |
} |
if (false) { |
+ static_library("test_support") { |
+ testonly = true |
+ sources = gypi_values.views_test_support_sources |
-static_library("test_support") { |
- testonly = true |
- sources = gypi_values.views_test_support_sources |
- |
- public_deps = [ |
- ":views", |
- ] |
- deps = [ |
- "//base", |
- "//skia", |
- "//testing/gtest", |
- "//ui/aura", |
- "//ui/base", |
- "//ui/compositor", |
- "//ui/compositor:test_support", |
- "//ui/events", |
- "//ui/events:events_base", |
- "//ui/events:test_support", |
- "//ui/events/platform", |
- "//ui/gfx", |
- "//ui/gfx/geometry", |
- "//ui/wm", |
- ] |
- |
- if (use_aura) { |
- sources += gypi_values.views_test_support_aura_sources |
- deps += [ "//ui/aura:test_support" ] |
- } |
- if (use_x11) { |
- deps += [ "//ui/gfx/x" ] |
- } |
-} |
- |
-test("views_unittests") { |
- sources = gypi_values.views_unittests_sources |
- |
- deps = [ |
- ":test_support", |
- "//base", |
- "//base:i18n", |
- "//base/allocator", |
- "//base/test:test_support", |
- "//skia", |
- "//testing/gtest", |
- "//third_party/icu", |
- "//ui/accessibility", |
- "//ui/aura", |
- "//ui/base", |
- "//ui/base:test_support", |
- "//ui/compositor:test_support", |
- "//ui/events:test_support", |
- "//ui/events:events_base", |
- "//ui/events/platform", |
- "//ui/gfx", |
- "//ui/gfx/geometry", |
- "//ui/gl", |
- "//ui/resources", |
- "//ui/strings", |
- "//ui/wm", |
- "//url", |
- ] |
- |
- if (is_chromeos) { |
- sources -= [ |
- "ime/input_method_bridge_unittest.cc", |
+ public_deps = [ |
+ ":views", |
] |
- } |
- |
- if (is_win) { |
- deps += [ |
- "//third_party/iaccessible2", |
- "//third_party/wtl", |
- ] |
- libs = [ |
- "imm32.lib", |
- "oleacc.lib", |
- "comctl32.lib", |
+ deps = [ |
+ "//base", |
+ "//skia", |
+ "//testing/gtest", |
+ "//ui/aura", |
+ "//ui/base", |
+ "//ui/compositor", |
+ "//ui/compositor:test_support", |
+ "//ui/events", |
+ "//ui/events:events_base", |
+ "//ui/events:test_support", |
+ "//ui/events/platform", |
+ "//ui/gfx", |
+ "//ui/gfx/geometry", |
+ "//ui/wm", |
] |
- # TOOD(GYP) |
- #'msvs_settings': { |
- # 'VCManifestTool': { |
- # 'AdditionalManifestFiles': [ |
- # '$(ProjectDir)\\test\\views_unittest.manifest', |
- # ], |
- # }, |
- #}, |
- } |
- if (use_x11) { |
- configs += [ |
- "//build/config/linux:x11", |
- "//build/config/linux:xext", |
- ] |
- deps += [ |
- "//ui/events/platform/x11", |
- "//ui/gfx/x", |
- ] |
+ if (use_aura) { |
+ sources += gypi_values.views_test_support_aura_sources |
+ deps += [ "//ui/aura:test_support" ] |
+ } |
+ if (use_x11) { |
+ deps += [ "//ui/gfx/x" ] |
+ } |
} |
- if (use_aura) { |
- sources += gypi_values.views_unittests_aura_sources |
- deps += [ "//ui/aura:test_support" ] |
- } |
- if (use_x11) { |
- deps += [ |
- "//ui/events/platform/x11", |
- "//ui/gfx/x", |
+ test("views_unittests") { |
+ sources = gypi_values.views_unittests_sources |
+ |
+ deps = [ |
+ ":test_support", |
+ "//base", |
+ "//base:i18n", |
+ "//base/allocator", |
+ "//base/test:test_support", |
+ "//skia", |
+ "//testing/gtest", |
+ "//third_party/icu", |
+ "//ui/accessibility", |
+ "//ui/aura", |
+ "//ui/base", |
+ "//ui/base:test_support", |
+ "//ui/compositor:test_support", |
+ "//ui/events:test_support", |
+ "//ui/events:events_base", |
+ "//ui/events/platform", |
+ "//ui/gfx", |
+ "//ui/gfx/geometry", |
+ "//ui/gl", |
+ "//ui/resources", |
+ "//ui/strings", |
+ "//ui/wm", |
+ "//url", |
] |
- } |
-} |
+ if (is_chromeos) { |
+ sources -= [ "ime/input_method_bridge_unittest.cc" ] |
+ } |
+ |
+ if (is_win) { |
+ deps += [ |
+ "//third_party/iaccessible2", |
+ "//third_party/wtl", |
+ ] |
+ libs = [ |
+ "imm32.lib", |
+ "oleacc.lib", |
+ "comctl32.lib", |
+ ] |
+ |
+ # TOOD(GYP) |
+ #'msvs_settings': { |
+ # 'VCManifestTool': { |
+ # 'AdditionalManifestFiles': [ |
+ # '$(ProjectDir)\\test\\views_unittest.manifest', |
+ # ], |
+ # }, |
+ #}, |
+ } |
+ |
+ if (use_x11) { |
+ configs += [ |
+ "//build/config/linux:x11", |
+ "//build/config/linux:xext", |
+ ] |
+ deps += [ |
+ "//ui/events/platform/x11", |
+ "//ui/gfx/x", |
+ ] |
+ } |
+ |
+ if (use_aura) { |
+ sources += gypi_values.views_unittests_aura_sources |
+ deps += [ "//ui/aura:test_support" ] |
+ } |
+ if (use_x11) { |
+ deps += [ |
+ "//ui/events/platform/x11", |
+ "//ui/gfx/x", |
+ ] |
+ } |
+ } |
} # if (false) |