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

Unified Diff: ash/ash.gyp

Issue 9316029: Include ui_strings in aura_shell_unittests to fix the build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove a comment 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 | « no previous file | ash/test/test_suite.cc » ('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 c635ed153519dbde3c105a70533af74d2867c97f..3d5696e30e5c0836604a177c90b09fddc59ba2c3 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -266,6 +266,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',
+ ],
+ }],
],
},
{
@@ -341,6 +346,7 @@
'action_name': 'ash_strings',
'variables': {
'grit_grd_file': 'ash_strings.grd',
+ 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ash_strings',
},
'includes': [ '../build/grit_action.gypi' ],
},
@@ -348,4 +354,36 @@
'includes': [ '../build/grit_target.gypi' ],
},
],
+ '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 | « no previous file | ash/test/test_suite.cc » ('j') | ash/test/test_suite.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698