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

Side by Side Diff: chrome/chrome_common.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_browser.gypi ('k') | chrome/chrome_tests.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': 'common', 8 'target_name': 'common',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 10 'variables': {
(...skipping 11 matching lines...) Expand all
22 # TODO(gregoryd): chrome_resources and chrome_strings could be 22 # TODO(gregoryd): chrome_resources and chrome_strings could be
23 # shared with the 64-bit target, but it does not work due to a gyp 23 # shared with the 64-bit target, but it does not work due to a gyp
24 # issue. 24 # issue.
25 'app/policy/cloud_policy_codegen.gyp:policy', 25 'app/policy/cloud_policy_codegen.gyp:policy',
26 'chrome_resources', 26 'chrome_resources',
27 'chrome_strings', 27 'chrome_strings',
28 'common_constants', 28 'common_constants',
29 'common_net', 29 'common_net',
30 'default_plugin/default_plugin.gyp:default_plugin', 30 'default_plugin/default_plugin.gyp:default_plugin',
31 'theme_resources', 31 'theme_resources',
32 'theme_resources_standard',
33 '../base/base.gyp:base', 32 '../base/base.gyp:base',
34 '../base/base.gyp:base_i18n', 33 '../base/base.gyp:base_i18n',
35 '../base/base.gyp:base_static', 34 '../base/base.gyp:base_static',
36 '../build/temp_gyp/googleurl.gyp:googleurl', 35 '../build/temp_gyp/googleurl.gyp:googleurl',
37 '../content/content.gyp:content_common', 36 '../content/content.gyp:content_common',
38 '../ipc/ipc.gyp:ipc', 37 '../ipc/ipc.gyp:ipc',
39 '../net/net.gyp:net', 38 '../net/net.gyp:net',
40 '../printing/printing.gyp:printing', 39 '../printing/printing.gyp:printing',
41 '../skia/skia.gyp:skia', 40 '../skia/skia.gyp:skia',
42 '../third_party/bzip2/bzip2.gyp:bzip2', 41 '../third_party/bzip2/bzip2.gyp:bzip2',
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 'common/safe_browsing/csd.proto' 402 'common/safe_browsing/csd.proto'
404 ], 403 ],
405 'variables': { 404 'variables': {
406 'proto_in_dir': 'common/safe_browsing', 405 'proto_in_dir': 'common/safe_browsing',
407 'proto_out_dir': 'chrome/common/safe_browsing', 406 'proto_out_dir': 'chrome/common/safe_browsing',
408 }, 407 },
409 'includes': [ '../build/protoc.gypi' ], 408 'includes': [ '../build/protoc.gypi' ],
410 }, 409 },
411 ], 410 ],
412 } 411 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698