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

Side by Side Diff: chrome/chrome.gyp

Issue 912503003: Remove "nacl_defines" from the GYP build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | chrome/chrome_browser.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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 # Define the common dependencies that contain all the actual 8 # Define the common dependencies that contain all the actual
9 # Chromium functionality. This list gets pulled in below by 9 # Chromium functionality. This list gets pulled in below by
10 # the link of the actual chrome (or chromium) executable on 10 # the link of the actual chrome (or chromium) executable on
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 # on 64-bit Windows only. Targets that end with nacl_win64 should be used 109 # on 64-bit Windows only. Targets that end with nacl_win64 should be used
110 # by Native Client only. 110 # by Native Client only.
111 # NOTE: Most new includes should go in the OS!="ios" condition below. 111 # NOTE: Most new includes should go in the OS!="ios" condition below.
112 '../build/chrome_settings.gypi', 112 '../build/chrome_settings.gypi',
113 '../build/util/version.gypi', 113 '../build/util/version.gypi',
114 '../build/win_precompile.gypi', 114 '../build/win_precompile.gypi',
115 'chrome_browser.gypi', 115 'chrome_browser.gypi',
116 'chrome_browser_ui.gypi', 116 'chrome_browser_ui.gypi',
117 'chrome_common.gypi', 117 'chrome_common.gypi',
118 'chrome_installer_util.gypi', 118 'chrome_installer_util.gypi',
119 '../components/nacl/nacl_defines.gypi',
120 ], 119 ],
121 'conditions': [ 120 'conditions': [
122 ['OS!="ios"', { 121 ['OS!="ios"', {
123 'includes': [ 122 'includes': [
124 '../apps/apps.gypi', 123 '../apps/apps.gypi',
125 'app_installer/app_installer.gypi', 124 'app_installer/app_installer.gypi',
126 'chrome_child.gypi', 125 'chrome_child.gypi',
127 'chrome_debugger.gypi', 126 'chrome_debugger.gypi',
128 'chrome_dll.gypi', 127 'chrome_dll.gypi',
129 'chrome_exe.gypi', 128 'chrome_exe.gypi',
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after
778 'service/service_utility_process_host.cc', 777 'service/service_utility_process_host.cc',
779 'service/service_utility_process_host.h', 778 'service/service_utility_process_host.h',
780 ], 779 ],
781 }], 780 }],
782 ], 781 ],
783 }, 782 },
784 ], 783 ],
785 }], 784 }],
786 ], # 'conditions' 785 ], # 'conditions'
787 } 786 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698