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

Unified Diff: build/all.gyp

Issue 9701002: Aura/ash split: Split the extra parts into ash and aura parts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to trunk to try again Created 8 years, 9 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 | chrome/browser/about_flags.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
diff --git a/build/all.gyp b/build/all.gyp
index 737f04873a710833cb3e99ec1195eeb6dfb94510..2011187f0e74c9878b9e58f65e727f7a0c96dfd0 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -573,8 +573,6 @@
'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',
@@ -598,6 +596,12 @@
'../chrome/chrome.gyp:crash_service_win64',
],
}],
+ ['use_ash==1', {
+ 'dependencies': [
+ '../ash/ash.gyp:ash_shell',
+ '../ash/ash.gyp:aura_shell_unittests',
+ ],
+ }],
['OS=="linux"', {
# Tests that currently only work on Linux.
'dependencies': [
« no previous file with comments | « no previous file | chrome/browser/about_flags.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698