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

Unified Diff: chrome/chrome_common.gypi

Issue 7863024: Make the NaCl windows 64 bit binaries not depend on chrome targets. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: remove nacl_win64 and dummy hacks 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 side-by-side diff with in-line comments
Download patch
Index: chrome/chrome_common.gypi
===================================================================
--- chrome/chrome_common.gypi (revision 100565)
+++ chrome/chrome_common.gypi (working copy)
@@ -430,73 +430,4 @@
'includes': [ '../build/protoc.gypi' ],
},
],
- 'conditions': [
- ['OS=="win"', {
- 'targets': [
- {
- 'target_name': 'common_nacl_win64',
- 'type': 'static_library',
- 'variables': {
- 'chrome_common_target': 1,
- },
- 'dependencies': [
- # TODO(gregoryd): chrome_resources and chrome_strings could be
- # shared with the 32-bit target, but it does not work due to a gyp
- # issue.
- 'chrome_resources',
- 'chrome_strings',
- 'common_constants_win64',
- 'app/policy/cloud_policy_codegen.gyp:policy_win64',
- '../base/base.gyp:base_nacl_win64',
- '../ipc/ipc.gyp:ipc_win64',
- '../third_party/libxml/libxml.gyp:libxml',
- '../ui/ui.gyp:ui_nacl_win64',
- '../ui/ui.gyp:ui_resources',
- '../ui/ui.gyp:ui_resources_standard',
- ],
- 'include_dirs': [
- '../third_party/icu/public/i18n',
- '../third_party/icu/public/common',
- # We usually get these skia directories by adding a dependency on
- # skia, bu we don't need it for NaCl's 64-bit Windows support. The
- # directories are required for resolving the includes in any case.
- '../third_party/skia/include/config',
- '../third_party/skia/include/core',
- '../skia/config',
- '../skia/config/win',
- ],
- 'defines': [
- '<@(nacl_win64_defines)',
- ],
- 'sources': [
- '../webkit/glue/webkit_glue_dummy.cc',
- 'common/url_constants.cc',
- # TODO(bradnelson): once automatic generation of 64 bit targets on
- # Windows is ready, take this out and add a dependency on
- # content_common.gypi.
- '../content/common/file_system/file_system_dispatcher_dummy.cc',
- '../content/common/message_router.cc',
- '../content/common/quota_dispatcher_dummy.cc',
- '../content/common/resource_dispatcher_dummy.cc',
- '../content/common/socket_stream_dispatcher_dummy.cc',
- ],
- 'export_dependent_settings': [
- 'app/policy/cloud_policy_codegen.gyp:policy_win64',
- ],
- # TODO(gregoryd): This could be shared with the 32-bit target, but
- # it does not work due to a gyp issue.
- 'direct_dependent_settings': {
- 'include_dirs': [
- '..',
- ],
- },
- 'configurations': {
- 'Common_Base': {
- 'msvs_target_platform': 'x64',
- },
- },
- },
- ],
- }],
- ],
}
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/chrome_dll.gypi » ('j') | chrome/chrome_exe.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698