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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_resources.gyp

Issue 136793004: Only include ash_strings if use_ash==1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed USE_ASH assignment in python Created 6 years, 11 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 | « chrome/chrome_repack_pseudo_locales.gypi ('k') | chrome/tools/build/repack_locales.py » ('j') | chrome/tools/build/repack_locales.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_resources.gyp
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index eebc31a6bbb53f0413189b70af3c19b3d72ecb87..7574fb25d17b169120d273bf7230ca09c8ab04de 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -382,8 +382,6 @@
'conditions': [
['OS != "ios"', {
'dependencies': [
- # TODO(zork): Protect this with if use_aura==1
- '<(DEPTH)/ash/ash_strings.gyp:ash_strings',
'<(DEPTH)/content/content_resources.gyp:content_resources',
'<(DEPTH)/device/bluetooth/bluetooth_strings.gyp:device_bluetooth_strings',
'<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
@@ -392,6 +390,7 @@
}],
['use_ash==1', {
'dependencies': [
+ '<(DEPTH)/ash/ash_strings.gyp:ash_strings',
'<(DEPTH)/ash/ash.gyp:ash_resources',
],
}],
« no previous file with comments | « chrome/chrome_repack_pseudo_locales.gypi ('k') | chrome/tools/build/repack_locales.py » ('j') | chrome/tools/build/repack_locales.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698