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

Side by Side Diff: extensions/extensions.gyp

Issue 418133002: Fix missing string resource for extensions_unittests on Chrome OS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | extensions/shell/app_shell.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after
696 # refactoring (ExtensionsBrowserClient, TestingProfile, etc.). 696 # refactoring (ExtensionsBrowserClient, TestingProfile, etc.).
697 # http://crbug.com/348066 697 # http://crbug.com/348066
698 'target_name': 'extensions_unittests', 698 'target_name': 'extensions_unittests',
699 'type': 'executable', 699 'type': 'executable',
700 'dependencies': [ 700 'dependencies': [
701 '../base/base.gyp:base', 701 '../base/base.gyp:base',
702 '../base/base.gyp:test_support_base', 702 '../base/base.gyp:test_support_base',
703 '../content/content_shell_and_tests.gyp:test_support_content', 703 '../content/content_shell_and_tests.gyp:test_support_content',
704 '../testing/gmock.gyp:gmock', 704 '../testing/gmock.gyp:gmock',
705 '../testing/gtest.gyp:gtest', 705 '../testing/gtest.gyp:gtest',
706 '../ui/strings/ui_strings.gyp:ui_strings',
706 'extensions_common', 707 'extensions_common',
707 'extensions_renderer', 708 'extensions_renderer',
708 'extensions_resources.gyp:extensions_resources', 709 'extensions_resources.gyp:extensions_resources',
709 'extensions_strings.gyp:extensions_strings', 710 'extensions_strings.gyp:extensions_strings',
710 'extensions_test_support', 711 'extensions_test_support',
711 ], 712 ],
712 'sources': [ 713 'sources': [
713 'browser/process_manager_unittest.cc', 714 'browser/process_manager_unittest.cc',
714 'common/api/sockets/sockets_manifest_permission_unittest.cc', 715 'common/api/sockets/sockets_manifest_permission_unittest.cc',
715 'common/csp_validator_unittest.cc', 716 'common/csp_validator_unittest.cc',
(...skipping 20 matching lines...) Expand all
736 ], 737 ],
737 'conditions': [ 738 'conditions': [
738 ['OS=="win" and win_use_allocator_shim==1', { 739 ['OS=="win" and win_use_allocator_shim==1', {
739 'dependencies': [ 740 'dependencies': [
740 '../base/allocator/allocator.gyp:allocator', 741 '../base/allocator/allocator.gyp:allocator',
741 ], 742 ],
742 }], 743 }],
743 ], 744 ],
744 'actions': [ 745 'actions': [
745 { 746 {
747 # TODO(jamescook): Use the same .pak file for both app_shell and
748 # extensions_unittests by creating an extensions_resources.pak file
749 # that can be used in both places. This will save build time.
750 # http://crbug.com/397250
746 'action_name': 'repack_extensions_unittests_pak', 751 'action_name': 'repack_extensions_unittests_pak',
tfarina 2014/07/24 22:41:33 I have refactored this here -> https://codereview
747 'variables': { 752 'variables': {
748 'pak_inputs': [ 753 'pak_inputs': [
749 '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_resources.pak', 754 '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_resources.pak',
750 '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_renderer_resourc es.pak', 755 '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_renderer_resourc es.pak',
756 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.p ak',
757 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
751 ], 758 ],
752 'pak_output': '<(PRODUCT_DIR)/extensions_unittests_resources.pak', 759 'pak_output': '<(PRODUCT_DIR)/extensions_unittests_resources.pak',
753 }, 760 },
754 'includes': [ '../build/repack_action.gypi' ], 761 'includes': [ '../build/repack_action.gypi' ],
755 }, 762 },
756 ], 763 ],
757 }, 764 },
758 ] 765 ]
759 } 766 }
OLDNEW
« no previous file with comments | « no previous file | extensions/shell/app_shell.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698