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

Side by Side 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, 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | ash/test/test_suite.cc » ('j') | ash/test/test_suite.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 }, 9 },
10 10
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 ['exclude', 'tooltips/tooltip_controller_unittest.cc'], 259 ['exclude', 'tooltips/tooltip_controller_unittest.cc'],
260 ], 260 ],
261 'dependencies': [ 261 'dependencies': [
262 # Mac tests access resources via the 'AuraShell.app' directory. 262 # Mac tests access resources via the 'AuraShell.app' directory.
263 'ash_shell', 263 'ash_shell',
264 ], 264 ],
265 # Special linker instructions that avoids stripping Obj-C classes that 265 # Special linker instructions that avoids stripping Obj-C classes that
266 # are not referenced in code, but are referenced in nibs. 266 # are not referenced in code, but are referenced in nibs.
267 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 267 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
268 }], 268 }],
269 ['use_glib == 1', {
270 'dependencies': [
271 'aura_shell_unittests_strings',
272 ],
273 }],
269 ], 274 ],
270 }, 275 },
271 { 276 {
272 'target_name': 'ash_shell', 277 'target_name': 'ash_shell',
273 'type': 'executable', 278 'type': 'executable',
274 'dependencies': [ 279 'dependencies': [
275 '../base/base.gyp:base', 280 '../base/base.gyp:base',
276 '../base/base.gyp:base_i18n', 281 '../base/base.gyp:base_i18n',
277 '../chrome/chrome_resources.gyp:packed_resources', 282 '../chrome/chrome_resources.gyp:packed_resources',
278 '../skia/skia.gyp:skia', 283 '../skia/skia.gyp:skia',
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 }, 339 },
335 { 340 {
336 'target_name': 'ash_strings', 341 'target_name': 'ash_strings',
337 'type': 'none', 342 'type': 'none',
338 'actions': [ 343 'actions': [
339 # Localizable resources. 344 # Localizable resources.
340 { 345 {
341 'action_name': 'ash_strings', 346 'action_name': 'ash_strings',
342 'variables': { 347 'variables': {
343 'grit_grd_file': 'ash_strings.grd', 348 'grit_grd_file': 'ash_strings.grd',
349 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ash_strings',
344 }, 350 },
345 'includes': [ '../build/grit_action.gypi' ], 351 'includes': [ '../build/grit_action.gypi' ],
346 }, 352 },
347 ], 353 ],
348 'includes': [ '../build/grit_target.gypi' ], 354 'includes': [ '../build/grit_target.gypi' ],
349 }, 355 },
350 ], 356 ],
357 'conditions': [
358 ['os_posix == 1 and OS != "mac"', {
359 'targets': [{
360 'target_name': 'aura_shell_unittests_strings',
361 'type': 'none',
362 'variables': {
363 'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py',
364 },
365 'actions': [
366 {
367 'action_name': 'repack_aura_shell_unittests_strings',
368 'variables': {
369 'pak_inputs': [
370 '<(SHARED_INTERMEDIATE_DIR)/ash_strings/ash_strings_en-US.pak',
371 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak',
372 '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_se ttings_en-US.pak',
373 ],
374 },
375 'inputs': [
376 '<(repack_path)',
377 '<@(pak_inputs)',
378 ],
379 'outputs': [
380 '<(PRODUCT_DIR)/aura_shell_unittests_strings/en-US.pak',
381 ],
382 'action': ['python', '<(repack_path)', '<@(_outputs)',
383 '<@(pak_inputs)'],
384 },
385 ],
386 }],
387 }],
388 ],
351 } 389 }
OLDNEW
« 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