summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-24 00:19:29 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-24 00:19:29 +0000
commit2a48ad6626f754cd869515c0ead4b8a0e63eb05d (patch)
tree75c42e43f41b077e93462f3dbef7c0ca0de53025 /build
parentb65bdda36c548cd680eecbbfcfbd482b740e2eb3 (diff)
downloadchromium_src-2a48ad6626f754cd869515c0ead4b8a0e63eb05d.zip
chromium_src-2a48ad6626f754cd869515c0ead4b8a0e63eb05d.tar.gz
chromium_src-2a48ad6626f754cd869515c0ead4b8a0e63eb05d.tar.bz2
Move the gyp file to ash.
http://crbug.com/108457 TEST=none TBR=sky Review URL: http://codereview.chromium.org/9034017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115744 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/all.gyp6
1 files changed, 3 insertions, 3 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 80131a0..07fb11e 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -134,7 +134,7 @@
['use_aura==1', {
'dependencies': [
'../ui/aura/aura.gyp:*',
- '../ui/aura_shell/aura_shell.gyp:*',
+ '../ash/ash.gyp:*',
],
}],
['remoting==1', {
@@ -564,11 +564,11 @@
'target_name': 'aura_builder',
'type': 'none',
'dependencies': [
+ '../ash/ash.gyp:ash_shell',
+ '../ash/ash.gyp:aura_shell_unittests',
'../chrome/chrome.gyp:chrome',
'../chrome/chrome.gyp:unit_tests',
'../chrome/chrome.gyp:ui_tests',
- '../ui/aura_shell/aura_shell.gyp:aura_shell_exe',
- '../ui/aura_shell/aura_shell.gyp:aura_shell_unittests',
'../ui/aura/aura.gyp:*',
'../ui/gfx/compositor/compositor.gyp:*',
'../ui/views/views.gyp:views',