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

Unified Diff: build/all.gyp

Issue 7903018: More shell content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 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 | « no previous file | build/common.gypi » ('j') | ui/aura_shell/desktop_background_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
===================================================================
--- build/all.gyp (revision 101382)
+++ build/all.gyp (working copy)
@@ -90,7 +90,7 @@
}],
],
}],
- ['use_wayland == 1', {
+ ['use_wayland==1', {
'dependencies': [
'../ui/wayland/wayland.gyp:*',
],
@@ -121,7 +121,6 @@
'../third_party/bspatch/bspatch.gyp:*',
'../third_party/gles2_book/gles2_book.gyp:*',
'../tools/memory_watcher/memory_watcher.gyp:*',
- '../ui/aura/aura.gyp:*',
],
}, {
'dependencies': [
@@ -133,6 +132,12 @@
'../views/views.gyp:*',
],
}],
+ ['use_aura==1', {
+ 'dependencies': [
+ '../ui/aura/aura.gyp:*',
+ '../ui/aura_shell/aura_shell.gyp:*',
+ ],
+ }],
['remoting==1', {
'dependencies': [
'../remoting/remoting.gyp:*',
« no previous file with comments | « no previous file | build/common.gypi » ('j') | ui/aura_shell/desktop_background_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698