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

Unified Diff: ash/ash.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: Add .rc file Created 8 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 | « ash/DEPS ('k') | ash/ash_strings.grd » ('j') | ash/test/test_suite.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index a4dfdef08d95eaae7981fd7c2989c5ec8c0fa388..4e8a1bc9fdf2476ce3030543dbd3c01013f5c113 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -13,6 +13,7 @@
'target_name': 'ash',
'type': '<(component)',
'dependencies': [
+ 'ash_strings',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
@@ -198,6 +199,7 @@
'../ui/ui.gyp:ui_resources_standard',
'../ui/views/views.gyp:views',
'ash',
+ 'ash_strings',
],
'sources': [
'../ui/views/test/test_views_delegate.cc',
@@ -241,6 +243,7 @@
'wm/workspace_controller_unittest.cc',
'wm/workspace/workspace_manager_unittest.cc',
+ '<(SHARED_INTERMEDIATE_DIR)/ash_strings/ash_strings.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
@@ -265,6 +268,11 @@
# are not referenced in code, but are referenced in nibs.
'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
}],
+ ['use_glib == 1', {
+ 'dependencies': [
+ 'aura_shell_unittests_strings',
+ ],
+ }],
],
},
{
@@ -331,5 +339,57 @@
}],
],
},
+ {
+ 'target_name': 'ash_strings',
+ 'type': 'none',
+ 'actions': [
+ # Localizable resources.
+ {
+ 'action_name': 'ash_strings',
+ 'variables': {
+ 'grit_grd_file': 'ash_strings.grd',
+ 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ash_strings',
+ },
+ 'includes': [ '../build/grit_action.gypi' ],
+ },
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)/ash_strings',
+ ],
+ },
+ },
+ ],
+ 'conditions': [
+ ['os_posix == 1 and OS != "mac"', {
+ 'targets': [{
+ 'target_name': 'aura_shell_unittests_strings',
+ 'type': 'none',
+ 'variables': {
+ 'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py',
+ },
+ 'actions': [
+ {
+ 'action_name': 'repack_aura_shell_unittests_strings',
+ 'variables': {
+ 'pak_inputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/ash_strings/ash_strings_en-US.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak',
+ ],
+ },
+ 'inputs': [
+ '<(repack_path)',
+ '<@(pak_inputs)',
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/aura_shell_unittests_strings/en-US.pak',
+ ],
+ 'action': ['python', '<(repack_path)', '<@(_outputs)',
+ '<@(pak_inputs)'],
+ },
+ ],
+ }],
+ }],
],
}
« no previous file with comments | « ash/DEPS ('k') | ash/ash_strings.grd » ('j') | ash/test/test_suite.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698