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

Unified Diff: chrome/chrome_resources.gyp

Issue 9307037: Reland http://codereview.chromium.org/9121050/ with fix for aura_win (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Separate ash_strings into its own gyp to break circular dependencies Created 8 years, 10 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 | « ash/launcher/tabbed_launcher_button.cc ('k') | chrome/tools/build/repack_locales.py » ('j') | no next file with comments »
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 29227c7fde3a553ebfc8266c893f5d6bb33cb868..45c441bf6b4ec33276ece6e26fcf4474830a5489 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -269,6 +269,8 @@
'chrome_strings',
'platform_locale_settings',
'theme_resources',
+ # TODO(zork): Protect this with if use_aura==1
+ '<(DEPTH)/ash/ash_strings.gyp:ash_strings',
'<(DEPTH)/content/content_resources.gyp:content_resources',
'<(DEPTH)/net/net.gyp:net_resources',
'<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
« no previous file with comments | « ash/launcher/tabbed_launcher_button.cc ('k') | chrome/tools/build/repack_locales.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698