Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2275)

Unified Diff: ui/views/examples/examples.gyp

Issue 297143009: MacViews: Gets views_examples_with_content_exe compiling on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase to master Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/browser/shell_mac.mm ('k') | ui/views/examples/examples_window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/examples.gyp
diff --git a/ui/views/examples/examples.gyp b/ui/views/examples/examples.gyp
index aa41cd0fc2cf64a54b3e6f57f54a8b47173a6a97..4cf3a1bcf6b9cbe9ed82c56c731269e7fc5eb78b 100644
--- a/ui/views/examples/examples.gyp
+++ b/ui/views/examples/examples.gyp
@@ -14,7 +14,6 @@
'../../../skia/skia.gyp:skia',
'../../../third_party/icu/icu.gyp:icui18n',
'../../../third_party/icu/icu.gyp:icuuc',
- '../../aura/aura.gyp:aura',
'../../base/ui_base.gyp:ui_base',
'../../events/events.gyp:events',
'../../gfx/gfx.gyp:gfx',
@@ -90,6 +89,11 @@
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
}],
+ ['use_aura==1', {
+ 'dependencies': [
+ '../../aura/aura.gyp:aura',
+ ],
+ }],
],
}, # target_name: views_examples_lib
{
@@ -98,7 +102,6 @@
'dependencies': [
'../../../base/base.gyp:base',
'../../../base/base.gyp:base_i18n',
- '../../aura/aura.gyp:aura',
'../../base/ui_base.gyp:ui_base',
'../../compositor/compositor.gyp:compositor',
'../../compositor/compositor.gyp:compositor_test_support',
@@ -111,6 +114,13 @@
'sources': [
'examples_main.cc',
],
+ 'conditions': [
+ ['use_aura==1', {
+ 'dependencies': [
+ '../../aura/aura.gyp:aura',
+ ],
+ }],
+ ],
}, # target_name: views_examples_exe
{
'target_name': 'views_examples_with_content_lib',
« no previous file with comments | « content/shell/browser/shell_mac.mm ('k') | ui/views/examples/examples_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698