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

Side by Side Diff: chrome/chrome.gyp

Issue 257029: Add an option to disable NaCl at compile time for platforms where it doesn't build yet (Closed)
Patch Set: Created 11 years, 2 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
« no previous file with comments | « chrome/browser/plugin_service.cc ('k') | chrome/renderer/render_process.cc » ('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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 # Define the common dependencies that contain all the actual 9 # Define the common dependencies that contain all the actual
10 # Chromium functionality. This list gets pulled in below by 10 # Chromium functionality. This list gets pulled in below by
(...skipping 2980 matching lines...) Expand 10 before | Expand all | Expand 10 after
2991 ], 2991 ],
2992 },], 2992 },],
2993 ], 2993 ],
2994 }, 2994 },
2995 { 2995 {
2996 'target_name': 'renderer', 2996 'target_name': 'renderer',
2997 'type': '<(library)', 2997 'type': '<(library)',
2998 'msvs_guid': '9301A569-5D2B-4D11-9332-B1E30AEACB8D', 2998 'msvs_guid': '9301A569-5D2B-4D11-9332-B1E30AEACB8D',
2999 'dependencies': [ 2999 'dependencies': [
3000 'common', 3000 'common',
3001 'nacl',
3002 'plugin', 3001 'plugin',
3003 'chrome_resources', 3002 'chrome_resources',
3004 'chrome_strings', 3003 'chrome_strings',
3005 '../printing/printing.gyp:printing', 3004 '../printing/printing.gyp:printing',
3006 '../skia/skia.gyp:skia', 3005 '../skia/skia.gyp:skia',
3007 '../third_party/icu/icu.gyp:icui18n', 3006 '../third_party/icu/icu.gyp:icui18n',
3008 '../third_party/icu/icu.gyp:icuuc', 3007 '../third_party/icu/icu.gyp:icuuc',
3009 '../third_party/npapi/npapi.gyp:npapi', 3008 '../third_party/npapi/npapi.gyp:npapi',
3010 '../webkit/webkit.gyp:glue', 3009 '../webkit/webkit.gyp:glue',
3011 '../webkit/webkit.gyp:webkit', 3010 '../webkit/webkit.gyp:webkit',
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
3107 'renderer/webplugin_delegate_proxy.h', 3106 'renderer/webplugin_delegate_proxy.h',
3108 'renderer/webworker_proxy.cc', 3107 'renderer/webworker_proxy.cc',
3109 'renderer/webworker_proxy.h', 3108 'renderer/webworker_proxy.h',
3110 ], 3109 ],
3111 'link_settings': { 3110 'link_settings': {
3112 'mac_bundle_resources': [ 3111 'mac_bundle_resources': [
3113 'renderer/renderer.sb', 3112 'renderer/renderer.sb',
3114 ], 3113 ],
3115 }, 3114 },
3116 'conditions': [ 3115 'conditions': [
3116 ['disable_nacl!=1', {
3117 'dependencies': [
3118 'nacl',
3119 ],
3120 }],
3117 # Linux-specific rules. 3121 # Linux-specific rules.
3118 ['OS=="linux"', { 3122 ['OS=="linux"', {
3119 'dependencies': [ 3123 'dependencies': [
3120 '../build/linux/system.gyp:gtk', 3124 '../build/linux/system.gyp:gtk',
3121 '../sandbox/sandbox.gyp:sandbox', 3125 '../sandbox/sandbox.gyp:sandbox',
3122 ], 3126 ],
3123 }], 3127 }],
3124 # Windows-specific rules. 3128 # Windows-specific rules.
3125 ['OS=="win"', { 3129 ['OS=="win"', {
3126 'include_dirs': [ 3130 'include_dirs': [
(...skipping 3656 matching lines...) Expand 10 before | Expand all | Expand 10 after
6783 'defines': [ 6787 'defines': [
6784 'POSIX', 6788 'POSIX',
6785 ], 6789 ],
6786 }], 6790 }],
6787 ], 6791 ],
6788 }, 6792 },
6789 ], # targets when chrome_personalization==1 6793 ], # targets when chrome_personalization==1
6790 }], 6794 }],
6791 ], # 'conditions' 6795 ], # 'conditions'
6792 } 6796 }
OLDNEW
« no previous file with comments | « chrome/browser/plugin_service.cc ('k') | chrome/renderer/render_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698