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

Side by Side Diff: chrome/chrome.gyp

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: simplify chrome_exe.gypi 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/browser/renderer_host/render_process_host_dummy.cc ('k') | chrome/chrome_common.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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 'variables': { 8 'variables': {
9 'version_py_path': 'tools/build/version.py', 9 'version_py_path': 'tools/build/version.py',
10 'version_path': 'VERSION', 10 'version_path': 'VERSION',
(...skipping 18 matching lines...) Expand all
29 'syncapi_core', 29 'syncapi_core',
30 'utility', 30 'utility',
31 'service', 31 'service',
32 '../content/content.gyp:content_app', 32 '../content/content.gyp:content_app',
33 '../content/content.gyp:content_gpu', 33 '../content/content.gyp:content_gpu',
34 '../content/content.gyp:content_ppapi_plugin', 34 '../content/content.gyp:content_ppapi_plugin',
35 '../content/content.gyp:content_worker', 35 '../content/content.gyp:content_worker',
36 '../printing/printing.gyp:printing', 36 '../printing/printing.gyp:printing',
37 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:inspector_resourc es', 37 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:inspector_resourc es',
38 ], 38 ],
39 'nacl_win64_dependencies': [
40 'common_nacl_win64',
41 'common_constants_win64',
42 'installer_util_nacl_win64',
43 '../base/base.gyp:base_static_win64',
44 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_a nnotations_win64',
45 ],
46 'allocator_target': '../base/allocator/allocator.gyp:allocator', 39 'allocator_target': '../base/allocator/allocator.gyp:allocator',
47 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 40 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
48 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out', 41 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
49 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'], 42 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
50 # TODO: remove this helper when we have loops in GYP 43 # TODO: remove this helper when we have loops in GYP
51 'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py'], 44 'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py'],
52 'conditions': [ 45 'conditions': [
53 ['OS=="win"', { 46 ['OS=="win"', {
54 'nacl_defines': [ 47 'nacl_defines': [
55 'NACL_WINDOWS=1', 48 'NACL_WINDOWS=1',
(...skipping 1332 matching lines...) Expand 10 before | Expand all | Expand 10 after
1388 ], 1381 ],
1389 'direct_dependent_settings': { 1382 'direct_dependent_settings': {
1390 'include_dirs': [ 1383 'include_dirs': [
1391 '<(SHARED_INTERMEDIATE_DIR)/chrome_version', 1384 '<(SHARED_INTERMEDIATE_DIR)/chrome_version',
1392 ], 1385 ],
1393 }, 1386 },
1394 'sources': [ 1387 'sources': [
1395 'app/chrome_exe.ver', 1388 'app/chrome_exe.ver',
1396 'app/chrome_dll.ver', 1389 'app/chrome_dll.ver',
1397 'app/nacl64_exe.ver', 1390 'app/nacl64_exe.ver',
1398 'app/nacl64_dll.ver',
1399 'app/other.ver', 1391 'app/other.ver',
1400 ], 1392 ],
1401 'rules': [ 1393 'rules': [
1402 { 1394 {
1403 'rule_name': 'version', 1395 'rule_name': 'version',
1404 'extension': 'ver', 1396 'extension': 'ver',
1405 'variables': { 1397 'variables': {
1406 'lastchange_path': 1398 'lastchange_path':
1407 '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', 1399 '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
1408 'template_input_path': 'app/chrome_version.rc.version', 1400 'template_input_path': 'app/chrome_version.rc.version',
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
1548 'VCLinkerTool': { 1540 'VCLinkerTool': {
1549 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 1541 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
1550 }, 1542 },
1551 }, 1543 },
1552 }, 1544 },
1553 { 1545 {
1554 'target_name': 'crash_service_win64', 1546 'target_name': 'crash_service_win64',
1555 'type': 'executable', 1547 'type': 'executable',
1556 'product_name': 'crash_service64', 1548 'product_name': 'crash_service64',
1557 'dependencies': [ 1549 'dependencies': [
1558 'app/policy/cloud_policy_codegen.gyp:policy_win64',
1559 'common_constants_win64', 1550 'common_constants_win64',
1560 'installer_util_nacl_win64', 1551 'installer_util_nacl_win64',
1561 '../base/base.gyp:base_static_win64', 1552 '../base/base.gyp:base_static_win64',
1562 '../breakpad/breakpad.gyp:breakpad_handler_win64', 1553 '../breakpad/breakpad.gyp:breakpad_handler_win64',
1563 '../breakpad/breakpad.gyp:breakpad_sender_win64', 1554 '../breakpad/breakpad.gyp:breakpad_sender_win64',
1564 ], 1555 ],
1565 'include_dirs': [ 1556 'include_dirs': [
1566 '..', 1557 '..',
1567 ], 1558 ],
1568 'sources': [ 1559 'sources': [
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
1728 'destination': '<(PRODUCT_DIR)', 1719 'destination': '<(PRODUCT_DIR)',
1729 'files': [ 1720 'files': [
1730 '<(INTERMEDIATE_DIR)/repack/chrome.pak' 1721 '<(INTERMEDIATE_DIR)/repack/chrome.pak'
1731 ], 1722 ],
1732 }, 1723 },
1733 ], 1724 ],
1734 }], # targets 1725 }], # targets
1735 }], # OS != "mac" 1726 }], # OS != "mac"
1736 ], # 'conditions' 1727 ], # 'conditions'
1737 } 1728 }
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/render_process_host_dummy.cc ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698