summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ui/aura/aura.gyp22
-rw-r--r--ui/aura_shell/aura_shell.gyp20
-rw-r--r--ui/gfx/compositor/compositor.gyp8
-rw-r--r--views/views.gyp59
4 files changed, 71 insertions, 38 deletions
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index f6496636..5b70c14 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -76,14 +76,13 @@
'target_name': 'aura_unittests',
'type': 'executable',
'dependencies': [
- '<(DEPTH)/base/base.gyp:test_support_base',
- '<(DEPTH)/chrome/chrome.gyp:packed_resources',
- '<(DEPTH)/skia/skia.gyp:skia',
- '<(DEPTH)/testing/gtest.gyp:gtest',
- '<(DEPTH)/ui/ui.gyp:gfx_resources',
- '<(DEPTH)/ui/ui.gyp:ui',
- '<(DEPTH)/ui/ui.gyp:ui_resources',
- '<(DEPTH)/ui/gfx/gl/gl.gyp:gl',
+ '../../base/base.gyp:test_support_base',
+ '../../skia/skia.gyp:skia',
+ '../../testing/gtest.gyp:gtest',
+ '../gfx/gl/gl.gyp:gl',
+ '../ui.gyp:gfx_resources',
+ '../ui.gyp:ui',
+ '../ui.gyp:ui_resources',
'aura',
],
'include_dirs': [
@@ -97,6 +96,13 @@
'<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
],
+ 'conditions': [
+ ['OS!="mac"', {
+ 'dependencies': [
+ '../../chrome/chrome.gyp:packed_resources',
+ ],
+ }],
+ ],
},
],
}
diff --git a/ui/aura_shell/aura_shell.gyp b/ui/aura_shell/aura_shell.gyp
index 8cba09e..edd2d1f 100644
--- a/ui/aura_shell/aura_shell.gyp
+++ b/ui/aura_shell/aura_shell.gyp
@@ -20,13 +20,13 @@
'../../skia/skia.gyp:skia',
'../../third_party/icu/icu.gyp:icui18n',
'../../third_party/icu/icu.gyp:icuuc',
+ '../../views/views.gyp:views',
+ '../aura/aura.gyp:aura',
'../base/strings/ui_strings.gyp:ui_strings',
'../gfx/compositor/compositor.gyp:compositor',
'../ui.gyp:ui',
'../ui.gyp:ui_resources',
'../ui.gyp:ui_resources_standard',
- '../aura/aura.gyp:aura',
- '../../views/views.gyp:views',
],
'sources': [
# All .cc, .h under views, except unittests
@@ -79,7 +79,6 @@
'dependencies': [
'../../base/base.gyp:base',
'../../base/base.gyp:base_i18n',
- '../../chrome/chrome.gyp:packed_resources',
'../../skia/skia.gyp:skia',
'../../third_party/icu/icu.gyp:icui18n',
'../../third_party/icu/icu.gyp:icuuc',
@@ -105,6 +104,13 @@
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
],
+ 'conditions': [
+ ['OS!="mac"', {
+ 'dependencies': [
+ '../../chrome/chrome.gyp:packed_resources',
+ ],
+ }],
+ ],
},
# It's convenient for aura_shell developers to be able to build all
# compositor and aura targets from within this solution.
@@ -112,15 +118,15 @@
'target_name': 'buildbot_targets',
'type': 'none',
'dependencies': [
- 'aura_shell_exe',
- '../aura/aura.gyp:*',
- '../gfx/compositor/compositor.gyp:*',
'../../views/views.gyp:views',
'../../views/views.gyp:views_aura_desktop',
'../../views/views.gyp:views_desktop',
'../../views/views.gyp:views_desktop_lib',
'../../views/views.gyp:views_unittests',
+ '../aura/aura.gyp:*',
+ '../gfx/compositor/compositor.gyp:*',
+ 'aura_shell_exe',
],
- },
+ },
],
}
diff --git a/ui/gfx/compositor/compositor.gyp b/ui/gfx/compositor/compositor.gyp
index 136ff3c..c605f7e 100644
--- a/ui/gfx/compositor/compositor.gyp
+++ b/ui/gfx/compositor/compositor.gyp
@@ -85,7 +85,6 @@
'dependencies': [
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/base.gyp:test_support_base',
- '<(DEPTH)/chrome/chrome.gyp:packed_resources',
'<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/ui/gfx/gl/gl.gyp:gl',
@@ -109,6 +108,13 @@
'<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
],
+ 'conditions': [
+ ['OS!="mac"', {
+ 'dependencies': [
+ '<(DEPTH)/chrome/chrome.gyp:packed_resources',
+ ],
+ }],
+ ],
},
],
}
diff --git a/views/views.gyp b/views/views.gyp
index e3bce08..d7f2439 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -411,7 +411,7 @@
'window/window_shape.h',
],
'include_dirs': [
- '<(DEPTH)/third_party/wtl/include',
+ '../third_party/wtl/include',
],
'conditions': [
['use_wayland == 1', {
@@ -530,7 +530,7 @@
}],
['OS=="win"', {
'include_dirs': [
- '<(DEPTH)/third_party/wtl/include',
+ '../third_party/wtl/include',
],
}],
['use_x11==0', {
@@ -547,7 +547,6 @@
'../base/base.gyp:base',
'../base/base.gyp:test_support_base',
'../build/temp_gyp/googleurl.gyp:googleurl',
- '../chrome/chrome.gyp:packed_resources',
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
@@ -612,7 +611,6 @@
['toolkit_uses_gtk == 1', {
'dependencies': [
'../build/linux/system.gyp:gtk',
- '../chrome/chrome.gyp:packed_resources',
],
'conditions': [
['linux_use_tcmalloc==1', {
@@ -628,20 +626,13 @@
],
}],
],
- },
- ],
+ }],
['touchui==0', {
'sources!': [
'touchui/touch_selection_controller_impl_unittest.cc',
],
}],
['OS=="win"', {
- 'dependencies': [
- # TODO(jcivelli): ideally the resource needed by views would be
- # factored out. (for some reason it pulls in a bunch
- # unrelated things like v8, sqlite nss...).
- '../chrome/chrome.gyp:packed_resources',
- ],
'link_settings': {
'libraries': [
'-limm32.lib',
@@ -649,7 +640,7 @@
]
},
'include_dirs': [
- '<(DEPTH)/third_party/wtl/include',
+ '../third_party/wtl/include',
],
}],
['use_ibus!=1', {
@@ -666,6 +657,14 @@
['exclude', 'controls/tabbed_pane/tabbed_pane_unittest.cc'],
],
}],
+ ['OS!="mac"', {
+ 'dependencies': [
+ # TODO(jcivelli): ideally the resource needed by views would be
+ # factored out. (for some reason it pulls in a bunch
+ # unrelated things like v8, sqlite nss...).
+ '../chrome/chrome.gyp:packed_resources',
+ ],
+ }],
],
},
{
@@ -741,7 +740,6 @@
['toolkit_uses_gtk == 1', {
'dependencies': [
'../build/linux/system.gyp:gtk',
- '../chrome/chrome.gyp:packed_resources',
],
'conditions': [
['linux_use_tcmalloc==1', {
@@ -760,13 +758,18 @@
]
},
'include_dirs': [
- '<(DEPTH)/third_party/wtl/include',
+ '../third_party/wtl/include',
],
'sources': [
'examples/table_example.cc',
'examples/table_example.h',
],
}],
+ ['OS!="mac"', {
+ 'dependencies': [
+ '../chrome/chrome.gyp:packed_resources',
+ ],
+ }],
],
},
{
@@ -797,7 +800,6 @@
['toolkit_uses_gtk == 1', {
'dependencies': [
'../build/linux/system.gyp:gtk',
- '../chrome/chrome.gyp:packed_resources',
],
'conditions': [
['linux_use_tcmalloc==1', {
@@ -816,9 +818,14 @@
]
},
'include_dirs': [
- '<(DEPTH)/third_party/wtl/include',
+ '../third_party/wtl/include',
],
}],
+ ['OS!="mac"', {
+ 'dependencies': [
+ '../chrome/chrome.gyp:packed_resources',
+ ],
+ }],
],
},
{
@@ -858,7 +865,6 @@
['use_glib == 1', {
'dependencies': [
'../build/linux/system.gyp:glib',
- '../chrome/chrome.gyp:packed_resources',
],
'conditions': [
['linux_use_tcmalloc==1', {
@@ -876,9 +882,14 @@
]
},
'include_dirs': [
- '<(DEPTH)/third_party/wtl/include',
+ '../third_party/wtl/include',
],
}],
+ ['OS!="mac"', {
+ 'dependencies': [
+ '../chrome/chrome.gyp:packed_resources',
+ ],
+ }],
],
},
],
@@ -891,7 +902,6 @@
'dependencies': [
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
- '../chrome/chrome.gyp:packed_resources',
'../skia/skia.gyp:skia',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
@@ -920,12 +930,17 @@
]
},
'include_dirs': [
- '<(DEPTH)/third_party/wtl/include',
+ '../third_party/wtl/include',
],
}],
+ ['OS!="mac"', {
+ 'dependencies': [
+ '../chrome/chrome.gyp:packed_resources',
+ ],
+ }],
],
},
],
- }],
+ }],
],
}
generated by cgit v1.1 at 2025-02-12 02:15:08 +0000