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

Side by Side Diff: chrome/chrome_common.gypi

Issue 7584007: make bubble_border to use resources under ui/resources. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: fix missing ui_resources_standard dependencies Created 9 years, 4 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
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 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'chrome_common_target': 0, 8 'chrome_common_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 '../printing/printing.gyp:printing', 119 '../printing/printing.gyp:printing',
120 '../skia/skia.gyp:skia', 120 '../skia/skia.gyp:skia',
121 '../third_party/bzip2/bzip2.gyp:bzip2', 121 '../third_party/bzip2/bzip2.gyp:bzip2',
122 '../third_party/icu/icu.gyp:icui18n', 122 '../third_party/icu/icu.gyp:icui18n',
123 '../third_party/icu/icu.gyp:icuuc', 123 '../third_party/icu/icu.gyp:icuuc',
124 '../third_party/libxml/libxml.gyp:libxml', 124 '../third_party/libxml/libxml.gyp:libxml',
125 '../third_party/protobuf/protobuf.gyp:protobuf_lite', 125 '../third_party/protobuf/protobuf.gyp:protobuf_lite',
126 '../third_party/sqlite/sqlite.gyp:sqlite', 126 '../third_party/sqlite/sqlite.gyp:sqlite',
127 '../third_party/zlib/zlib.gyp:zlib', 127 '../third_party/zlib/zlib.gyp:zlib',
128 '../ui/ui.gyp:ui_resources', 128 '../ui/ui.gyp:ui_resources',
129 '../ui/ui.gyp:ui_resources_standard',
129 '../webkit/support/webkit_support.gyp:glue', 130 '../webkit/support/webkit_support.gyp:glue',
130 ], 131 ],
131 'sources': [ 132 'sources': [
132 # .cc, .h, and .mm files under chrome/common that are not required for 133 # .cc, .h, and .mm files under chrome/common that are not required for
133 # building 64-bit Windows targets. Test files are not included. 134 # building 64-bit Windows targets. Test files are not included.
134 'common/automation_constants.cc', 135 'common/automation_constants.cc',
135 'common/automation_constants.h', 136 'common/automation_constants.h',
136 'common/automation_messages.cc', 137 'common/automation_messages.cc',
137 'common/automation_messages.h', 138 'common/automation_messages.h',
138 'common/automation_messages_internal.h', 139 'common/automation_messages_internal.h',
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 # issue. 520 # issue.
520 'chrome_resources', 521 'chrome_resources',
521 'chrome_strings', 522 'chrome_strings',
522 'common_constants_win64', 523 'common_constants_win64',
523 'app/policy/cloud_policy_codegen.gyp:policy_win64', 524 'app/policy/cloud_policy_codegen.gyp:policy_win64',
524 '../base/base.gyp:base_nacl_win64', 525 '../base/base.gyp:base_nacl_win64',
525 '../ipc/ipc.gyp:ipc_win64', 526 '../ipc/ipc.gyp:ipc_win64',
526 '../third_party/libxml/libxml.gyp:libxml', 527 '../third_party/libxml/libxml.gyp:libxml',
527 '../ui/ui.gyp:ui_nacl_win64', 528 '../ui/ui.gyp:ui_nacl_win64',
528 '../ui/ui.gyp:ui_resources', 529 '../ui/ui.gyp:ui_resources',
530 '../ui/ui.gyp:ui_resources_standard',
529 ], 531 ],
530 'include_dirs': [ 532 'include_dirs': [
531 '../third_party/icu/public/i18n', 533 '../third_party/icu/public/i18n',
532 '../third_party/icu/public/common', 534 '../third_party/icu/public/common',
533 # We usually get these skia directories by adding a dependency on 535 # We usually get these skia directories by adding a dependency on
534 # skia, bu we don't need it for NaCl's 64-bit Windows support. The 536 # skia, bu we don't need it for NaCl's 64-bit Windows support. The
535 # directories are required for resolving the includes in any case. 537 # directories are required for resolving the includes in any case.
536 '../third_party/skia/include/config', 538 '../third_party/skia/include/config',
537 '../third_party/skia/include/core', 539 '../third_party/skia/include/core',
538 '../skia/config', 540 '../skia/config',
(...skipping 27 matching lines...) Expand all
566 'configurations': { 568 'configurations': {
567 'Common_Base': { 569 'Common_Base': {
568 'msvs_target_platform': 'x64', 570 'msvs_target_platform': 'x64',
569 }, 571 },
570 }, 572 },
571 }, 573 },
572 ], 574 ],
573 }], 575 }],
574 ], 576 ],
575 } 577 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_tests.gypi » ('j') | tools/grit/resource_ids » ('J')

Powered by Google App Engine
This is Rietveld 408576698