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

Side by Side Diff: chrome/chrome_common.gypi

Issue 6409040: New policy protobuf protocol. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix build on mac and win; address comments Created 9 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
OLDNEW
1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 # it does not work due to a gyp issue. 195 # it does not work due to a gyp issue.
196 'direct_dependent_settings': { 196 'direct_dependent_settings': {
197 'include_dirs': [ 197 'include_dirs': [
198 '..', 198 '..',
199 ], 199 ],
200 }, 200 },
201 'dependencies': [ 201 'dependencies': [
202 # TODO(gregoryd): chrome_resources and chrome_strings could be 202 # TODO(gregoryd): chrome_resources and chrome_strings could be
203 # shared with the 64-bit target, but it does not work due to a gyp 203 # shared with the 64-bit target, but it does not work due to a gyp
204 # issue. 204 # issue.
205 'app/policy/cloud_policy_codegen.gyp:policy',
205 'chrome_resources', 206 'chrome_resources',
206 'chrome_strings', 207 'chrome_strings',
207 'common_constants', 208 'common_constants',
208 'common_net', 209 'common_net',
209 'default_plugin/default_plugin.gyp:default_plugin', 210 'default_plugin/default_plugin.gyp:default_plugin',
210 'policy',
211 'theme_resources', 211 'theme_resources',
212 '../app/app.gyp:app_base', 212 '../app/app.gyp:app_base',
213 '../app/app.gyp:app_resources', 213 '../app/app.gyp:app_resources',
214 '../base/base.gyp:base', 214 '../base/base.gyp:base',
215 '../base/base.gyp:base_i18n', 215 '../base/base.gyp:base_i18n',
216 '../build/temp_gyp/googleurl.gyp:googleurl', 216 '../build/temp_gyp/googleurl.gyp:googleurl',
217 '../ipc/ipc.gyp:ipc', 217 '../ipc/ipc.gyp:ipc',
218 '../net/net.gyp:net', 218 '../net/net.gyp:net',
219 '../printing/printing.gyp:printing', 219 '../printing/printing.gyp:printing',
220 '../skia/skia.gyp:skia', 220 '../skia/skia.gyp:skia',
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 'variables': { 585 'variables': {
586 'chrome_common_target': 1, 586 'chrome_common_target': 1,
587 }, 587 },
588 'dependencies': [ 588 'dependencies': [
589 # TODO(gregoryd): chrome_resources and chrome_strings could be 589 # TODO(gregoryd): chrome_resources and chrome_strings could be
590 # shared with the 32-bit target, but it does not work due to a gyp 590 # shared with the 32-bit target, but it does not work due to a gyp
591 # issue. 591 # issue.
592 'chrome_resources', 592 'chrome_resources',
593 'chrome_strings', 593 'chrome_strings',
594 'common_constants_win64', 594 'common_constants_win64',
595 'policy_win64', 595 'app/policy/cloud_policy_codegen.gyp:policy_win64',
596 '../app/app.gyp:app_base_nacl_win64', 596 '../app/app.gyp:app_base_nacl_win64',
597 '../app/app.gyp:app_resources', 597 '../app/app.gyp:app_resources',
598 '../base/base.gyp:base_nacl_win64', 598 '../base/base.gyp:base_nacl_win64',
599 '../ipc/ipc.gyp:ipc_win64', 599 '../ipc/ipc.gyp:ipc_win64',
600 '../third_party/libxml/libxml.gyp:libxml', 600 '../third_party/libxml/libxml.gyp:libxml',
601 ], 601 ],
602 'include_dirs': [ 602 'include_dirs': [
603 '../third_party/npapi', 603 '../third_party/npapi',
604 '../third_party/icu/public/i18n', 604 '../third_party/icu/public/i18n',
605 '../third_party/icu/public/common', 605 '../third_party/icu/public/common',
(...skipping 11 matching lines...) Expand all
617 ], 617 ],
618 'sources': [ 618 'sources': [
619 '../webkit/glue/webkit_glue_dummy.cc', 619 '../webkit/glue/webkit_glue_dummy.cc',
620 'common/file_system/file_system_dispatcher_dummy.cc', 620 'common/file_system/file_system_dispatcher_dummy.cc',
621 'common/resource_dispatcher_dummy.cc', 621 'common/resource_dispatcher_dummy.cc',
622 'common/socket_stream_dispatcher_dummy.cc', 622 'common/socket_stream_dispatcher_dummy.cc',
623 'common/url_constants.cc', 623 'common/url_constants.cc',
624 ], 624 ],
625 'export_dependent_settings': [ 625 'export_dependent_settings': [
626 '../app/app.gyp:app_base_nacl_win64', 626 '../app/app.gyp:app_base_nacl_win64',
627 'app/policy/cloud_policy_codegen.gyp:policy_win64',
627 ], 628 ],
628 # TODO(gregoryd): This could be shared with the 32-bit target, but 629 # TODO(gregoryd): This could be shared with the 32-bit target, but
629 # it does not work due to a gyp issue. 630 # it does not work due to a gyp issue.
630 'direct_dependent_settings': { 631 'direct_dependent_settings': {
631 'include_dirs': [ 632 'include_dirs': [
632 '..', 633 '..',
633 ], 634 ],
634 }, 635 },
635 'configurations': { 636 'configurations': {
636 'Common_Base': { 637 'Common_Base': {
637 'msvs_target_platform': 'x64', 638 'msvs_target_platform': 'x64',
638 }, 639 },
639 }, 640 },
640 }, 641 },
641 ], 642 ],
642 }], 643 }],
643 ], 644 ],
644 } 645 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698