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

Unified Diff: ash/ash_resources.gypi

Issue 10905242: add ash_resources.grd and necessary changes to use images in ash/resources (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: don't guard ash_strings with aura=1 Created 8 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 | « ash/ash.gyp ('k') | ash/desktop_background/desktop_background_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/ash_resources.gypi
diff --git a/ash/ash_strings.gyp b/ash/ash_resources.gypi
similarity index 55%
copy from ash/ash_strings.gyp
copy to ash/ash_resources.gypi
index 4b09ad25101e0265367fdb8c1b67aba2771b3dc0..5c2d62ad43b44e232cbd2e5c640792e4f6d2d5e9 100644
--- a/ash/ash_strings.gyp
+++ b/ash/ash_resources.gypi
@@ -3,28 +3,25 @@
# found in the LICENSE file.
{
- 'variables': {
- 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
- },
-
'targets': [
{
- 'target_name': 'ash_strings',
+ 'target_name': 'ash_resources',
'type': 'none',
+ 'variables': {
+ 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources',
+ },
'actions': [
- # Localizable resources.
{
- 'action_name': 'ash_strings',
+ 'action_name': 'ash_resources',
'variables': {
- 'grit_grd_file': 'ash_strings.grd',
- 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ash_strings',
+ 'grit_grd_file': 'resources/ash_resources.grd',
},
'includes': [ '../build/grit_action.gypi' ],
},
],
'direct_dependent_settings': {
'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)/ash_strings',
+ '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources',
],
},
},
« no previous file with comments | « ash/ash.gyp ('k') | ash/desktop_background/desktop_background_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698