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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 7906022: Merge theme_resources_large and theme_resources_standard targets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/chrome_common.gypi » ('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 (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': 'static_library', 9 'type': 'static_library',
10 'dependencies': [ 10 'dependencies': [
11 'app/policy/cloud_policy_codegen.gyp:policy', 11 'app/policy/cloud_policy_codegen.gyp:policy',
12 'browser/sync/protocol/sync_proto.gyp:sync_proto', 12 'browser/sync/protocol/sync_proto.gyp:sync_proto',
13 'chrome_extra_resources', 13 'chrome_extra_resources',
14 'chrome_resources', 14 'chrome_resources',
15 'chrome_strings', 15 'chrome_strings',
16 'common', 16 'common',
17 'common_net', 17 'common_net',
18 'debugger', 18 'debugger',
19 'in_memory_url_index_cache_proto', 19 'in_memory_url_index_cache_proto',
20 'installer_util', 20 'installer_util',
21 'platform_locale_settings', 21 'platform_locale_settings',
22 'profile_import', 22 'profile_import',
23 'safe_browsing_proto', 23 'safe_browsing_proto',
24 'safe_browsing_report_proto', 24 'safe_browsing_report_proto',
25 # TODO(sync): Make browser not depend on syncapi_core directly. 25 # TODO(sync): Make browser not depend on syncapi_core directly.
26 'syncapi_core', 26 'syncapi_core',
27 'syncapi_service', 27 'syncapi_service',
28 'theme_resources', 28 'theme_resources',
29 'theme_resources_large',
30 'theme_resources_standard',
31 'userfeedback_proto', 29 'userfeedback_proto',
32 '../build/temp_gyp/googleurl.gyp:googleurl', 30 '../build/temp_gyp/googleurl.gyp:googleurl',
33 '../content/content.gyp:content_browser', 31 '../content/content.gyp:content_browser',
34 '../crypto/crypto.gyp:crypto', 32 '../crypto/crypto.gyp:crypto',
35 '../media/media.gyp:media', 33 '../media/media.gyp:media',
36 '../net/net.gyp:net', 34 '../net/net.gyp:net',
37 '../ppapi/ppapi_internal.gyp:ppapi_proxy', # For PpapiMsg_LoadPlugin 35 '../ppapi/ppapi_internal.gyp:ppapi_proxy', # For PpapiMsg_LoadPlugin
38 '../printing/printing.gyp:printing', 36 '../printing/printing.gyp:printing',
39 '../skia/skia.gyp:skia', 37 '../skia/skia.gyp:skia',
40 '../third_party/bzip2/bzip2.gyp:bzip2', 38 '../third_party/bzip2/bzip2.gyp:bzip2',
(...skipping 3801 matching lines...) Expand 10 before | Expand all | Expand 10 after
3842 'browser/webdata/web_database_table.h', 3840 'browser/webdata/web_database_table.h',
3843 'browser/webdata/web_intents_table.cc', 3841 'browser/webdata/web_intents_table.cc',
3844 'browser/webdata/web_intents_table.h', 3842 'browser/webdata/web_intents_table.h',
3845 3843
3846 # These files are generated by GRIT. 3844 # These files are generated by GRIT.
3847 '<(grit_out_dir)/grit/component_extension_resources_map.cc', 3845 '<(grit_out_dir)/grit/component_extension_resources_map.cc',
3848 '<(grit_out_dir)/grit/devtools_frontend_resources_map.cc', 3846 '<(grit_out_dir)/grit/devtools_frontend_resources_map.cc',
3849 '<(grit_out_dir)/grit/devtools_resources_map.cc', 3847 '<(grit_out_dir)/grit/devtools_resources_map.cc',
3850 '<(grit_out_dir)/grit/shared_resources_map.cc', 3848 '<(grit_out_dir)/grit/shared_resources_map.cc',
3851 '<(grit_out_dir)/grit/theme_resources_map.cc', 3849 '<(grit_out_dir)/grit/theme_resources_map.cc',
3852 '<(grit_out_dir)/grit/theme_resources_large_map.cc',
3853 '<(grit_out_dir)/grit/theme_resources_standard_map.cc', 3850 '<(grit_out_dir)/grit/theme_resources_standard_map.cc',
3854 3851
3855 # This file is generated by the autofill_regexes action. 3852 # This file is generated by the autofill_regexes action.
3856 '<(INTERMEDIATE_DIR)/autofill_regex_constants.cc', 3853 '<(INTERMEDIATE_DIR)/autofill_regex_constants.cc',
3857 ], 3854 ],
3858 'actions': [{ 3855 'actions': [{
3859 'action_name': 'autofill_regexes', 3856 'action_name': 'autofill_regexes',
3860 'inputs': [ 3857 'inputs': [
3861 '<(DEPTH)/build/escape_unicode.py', 3858 '<(DEPTH)/build/escape_unicode.py',
3862 'browser/autofill/autofill_regex_constants.cc.utf8', 3859 'browser/autofill/autofill_regex_constants.cc.utf8',
(...skipping 1222 matching lines...) Expand 10 before | Expand all | Expand 10 after
5085 # weak imports in dependents, who still must #include 5082 # weak imports in dependents, who still must #include
5086 # closure_blocks_leopard_compat.h to get weak imports. 5083 # closure_blocks_leopard_compat.h to get weak imports.
5087 'type': 'none', 5084 'type': 'none',
5088 }], 5085 }],
5089 ], 5086 ],
5090 }, 5087 },
5091 ], 5088 ],
5092 }], 5089 }],
5093 ], 5090 ],
5094 } 5091 }
OLDNEW
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698