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

Unified Diff: ui/aura_shell/aura_shell.gyp

Issue 8770010: views: Move views.gyp to ui/views/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix aura build Created 9 years, 1 month 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/content_browser.gypi ('k') | ui/views/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/aura_shell.gyp
diff --git a/ui/aura_shell/aura_shell.gyp b/ui/aura_shell/aura_shell.gyp
index a15be0c033406bbe5ed34e3c91d8406772e67308..656c536301217fe69186ba1102c6a788a273d375 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',
+ '../views/views.gyp:views',
],
'defines': [
'AURA_SHELL_IMPLEMENTATION',
@@ -130,15 +130,15 @@
'../../testing/gtest.gyp:gtest',
'../../third_party/icu/icu.gyp:icui18n',
'../../third_party/icu/icu.gyp:icuuc',
- '../../views/views.gyp:views',
+ '../aura/aura.gyp:aura',
+ '../aura/aura.gyp:test_support_aura',
'../gfx/compositor/compositor.gyp:compositor_test_support',
'../gfx/compositor/compositor.gyp:test_compositor',
'../ui.gyp:gfx_resources',
'../ui.gyp:ui',
'../ui.gyp:ui_resources',
'../ui.gyp:ui_resources_standard',
- '../aura/aura.gyp:aura',
- '../aura/aura.gyp:test_support_aura',
+ '../views/views.gyp:views',
'aura_shell',
],
'sources': [
@@ -179,7 +179,6 @@
'../../skia/skia.gyp:skia',
'../../third_party/icu/icu.gyp:icui18n',
'../../third_party/icu/icu.gyp:icuuc',
- '../../views/views.gyp:views',
'../aura/aura.gyp:aura',
'../gfx/compositor/compositor.gyp:compositor',
'../gfx/compositor/compositor.gyp:compositor_test_support',
@@ -187,7 +186,8 @@
'../ui.gyp:ui',
'../ui.gyp:ui_resources',
'../ui.gyp:ui_resources_standard',
- '../../views/views.gyp:views_examples_lib',
+ '../views/views.gyp:views',
+ '../views/views.gyp:views_examples_lib',
'aura_shell',
],
'sources': [
« no previous file with comments | « content/content_browser.gypi ('k') | ui/views/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698