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

Side by Side Diff: chrome/chrome_common.gypi

Issue 4979003: Implement web app definition parsing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nacl64 build Created 10 years, 1 month 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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 'common/sandbox_policy.cc', 121 'common/sandbox_policy.cc',
122 'common/sandbox_policy.h', 122 'common/sandbox_policy.h',
123 'common/serialized_script_value.cc', 123 'common/serialized_script_value.cc',
124 'common/serialized_script_value.h', 124 'common/serialized_script_value.h',
125 'common/switch_utils.cc', 125 'common/switch_utils.cc',
126 'common/switch_utils.h', 126 'common/switch_utils.h',
127 'common/time_format.cc', 127 'common/time_format.cc',
128 'common/time_format.h', 128 'common/time_format.h',
129 'common/chrome_version_info.h', 129 'common/chrome_version_info.h',
130 'common/chrome_version_info.cc', 130 'common/chrome_version_info.cc',
131 'common/web_apps.h',
132 'common/web_apps.cc',
131 'common/webblobregistry_impl.cc', 133 'common/webblobregistry_impl.cc',
132 'common/webblobregistry_impl.h', 134 'common/webblobregistry_impl.h',
133 'common/win_safe_util.cc', 135 'common/win_safe_util.cc',
134 'common/win_safe_util.h', 136 'common/win_safe_util.h',
135 ], 137 ],
136 }], 138 }],
137 ], 139 ],
138 }, 140 },
139 'targets': [ 141 'targets': [
140 { 142 {
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 # TODO(gregoryd): chrome_resources and chrome_strings could be 531 # TODO(gregoryd): chrome_resources and chrome_strings could be
530 # shared with the 32-bit target, but it does not work due to a gyp 532 # shared with the 32-bit target, but it does not work due to a gyp
531 # issue. 533 # issue.
532 'chrome_resources', 534 'chrome_resources',
533 'chrome_strings', 535 'chrome_strings',
534 'common_constants_win64', 536 'common_constants_win64',
535 '../app/app.gyp:app_base_nacl_win64', 537 '../app/app.gyp:app_base_nacl_win64',
536 '../app/app.gyp:app_resources', 538 '../app/app.gyp:app_resources',
537 '../base/base.gyp:base_nacl_win64', 539 '../base/base.gyp:base_nacl_win64',
538 '../ipc/ipc.gyp:ipc_win64', 540 '../ipc/ipc.gyp:ipc_win64',
541 '../skia/skia.gyp:skia',
539 '../third_party/libxml/libxml.gyp:libxml', 542 '../third_party/libxml/libxml.gyp:libxml',
540 ], 543 ],
541 'include_dirs': [ 544 'include_dirs': [
542 '../third_party/npapi', 545 '../third_party/npapi',
543 '../third_party/icu/public/i18n', 546 '../third_party/icu/public/i18n',
544 '../third_party/icu/public/common', 547 '../third_party/icu/public/common',
545 # We usually get these skia directories by adding a dependency on
546 # skia, bu we don't need it for NaCl's 64-bit Windows support. The
547 # directories are required for resolving the includes in any case.
548 '../third_party/skia/include/core',
549 '../skia/config',
550 ],
551 'defines': [
552 'EXCLUDE_SKIA_DEPENDENCIES',
553 '<@(nacl_win64_defines)',
554 ], 548 ],
555 'sources': [ 549 'sources': [
556 '../webkit/glue/webkit_glue_dummy.cc', 550 '../webkit/glue/webkit_glue_dummy.cc',
557 'common/file_system/file_system_dispatcher_dummy.cc', 551 'common/file_system/file_system_dispatcher_dummy.cc',
558 'common/resource_dispatcher_dummy.cc', 552 'common/resource_dispatcher_dummy.cc',
559 'common/socket_stream_dispatcher_dummy.cc', 553 'common/socket_stream_dispatcher_dummy.cc',
560 'common/url_constants.cc', 554 'common/url_constants.cc',
561 ], 555 ],
562 'export_dependent_settings': [ 556 'export_dependent_settings': [
563 '../app/app.gyp:app_base_nacl_win64', 557 '../app/app.gyp:app_base_nacl_win64',
564 ], 558 ],
565 # TODO(gregoryd): This could be shared with the 32-bit target, but 559 # TODO(gregoryd): This could be shared with the 32-bit target, but
566 # it does not work due to a gyp issue. 560 # it does not work due to a gyp issue.
567 'direct_dependent_settings': { 561 'direct_dependent_settings': {
568 'include_dirs': [ 562 'include_dirs': [
569 '..', 563 '..',
570 ], 564 ],
571 }, 565 },
572 'configurations': { 566 'configurations': {
573 'Common_Base': { 567 'Common_Base': {
574 'msvs_target_platform': 'x64', 568 'msvs_target_platform': 'x64',
575 }, 569 },
576 }, 570 },
577 }, 571 },
578 ], 572 ],
579 }], 573 }],
580 ], 574 ],
581 } 575 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698