Commit f8c9260f authored by tfarina@chromium.org's avatar tfarina@chromium.org

Remove unnecessary dependencies on "ui" target from some other targets.

BUG=302505
TEST=None, targets built.
R=dalecurtis@chromium.org,thestig@chromium.org,ben@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232399 0039d316-1c4b-4281-b951-d872f2087c98
parent ec5c807d
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
'../third_party/opus/opus.gyp:opus', '../third_party/opus/opus.gyp:opus',
'../ui/events/events.gyp:events', '../ui/events/events.gyp:events',
'../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
'../url/url.gyp:url_lib', '../url/url.gyp:url_lib',
'shared_memory_support', 'shared_memory_support',
], ],
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
'../third_party/icu/icu.gyp:icuuc', '../third_party/icu/icu.gyp:icuuc',
'../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx',
'../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs', '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
'../ui/ui.gyp:ui',
'../url/url.gyp:url_lib', '../url/url.gyp:url_lib',
], ],
'defines': [ 'defines': [
......
include_rules = [ include_rules = [
"+ui/base",
"+ui/gfx", "+ui/gfx",
] ]
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
'dependencies': [ 'dependencies': [
'../../base/base.gyp:base', '../../base/base.gyp:base',
'../../ui/gfx/gfx.gyp:gfx', '../../ui/gfx/gfx.gyp:gfx',
'../../ui/ui.gyp:ui',
], ],
'defines': [ 'defines': [
'BUILD_MEMORY_WATCHER', 'BUILD_MEMORY_WATCHER',
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
'<(DEPTH)/ui/events/events.gyp:events', '<(DEPTH)/ui/events/events.gyp:events',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx', '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
'<(DEPTH)/ui/gl/gl.gyp:gl', '<(DEPTH)/ui/gl/gl.gyp:gl',
'<(DEPTH)/ui/ui.gyp:ui',
], ],
'defines': [ 'defines': [
'COMPOSITOR_IMPLEMENTATION', 'COMPOSITOR_IMPLEMENTATION',
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
'<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/third_party/mesa/mesa.gyp:mesa_headers', '<(DEPTH)/third_party/mesa/mesa.gyp:mesa_headers',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx', '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
'<(DEPTH)/ui/ui.gyp:ui',
], ],
'variables': { 'variables': {
'gl_binding_output_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/gl', 'gl_binding_output_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/gl',
...@@ -235,6 +234,21 @@ ...@@ -235,6 +234,21 @@
'<(gl_binding_output_dir)/gl_bindings_autogen_wgl.cc', '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.cc',
'<(gl_binding_output_dir)/gl_bindings_autogen_wgl.h', '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.h',
], ],
'msvs_settings': {
'VCLinkerTool': {
'DelayLoadDLLs': [
'dwmapi.dll',
],
'AdditionalDependencies': [
'dwmapi.lib',
],
},
},
'link_settings': {
'libraries': [
'-ldwmapi.lib',
],
},
}], }],
['OS=="mac"', { ['OS=="mac"', {
'sources': [ 'sources': [
......
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