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

Side by Side Diff: chrome/chrome_browser_chromeos.gypi

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 | « chrome/chrome_browser.gypi ('k') | chrome/chrome_browser_ui.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 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'variables': { 7 'variables': {
8 # These files lists are shared with the GN build. 8 # These files lists are shared with the GN build.
9 'browser_chromeos_sources': [ 9 'browser_chromeos_sources': [
10 # All .cc, .h, .m, and .mm files under browser/chromeos, except for test s 10 # All .cc, .h, .m, and .mm files under browser/chromeos, except for test s
(...skipping 1140 matching lines...) Expand 10 before | Expand all | Expand 10 after
1151 '../ui/resources/ui_resources.gyp:ui_resources', 1151 '../ui/resources/ui_resources.gyp:ui_resources',
1152 '../ui/strings/ui_strings.gyp:ui_strings', 1152 '../ui/strings/ui_strings.gyp:ui_strings',
1153 '../ui/surface/surface.gyp:surface', 1153 '../ui/surface/surface.gyp:surface',
1154 '../ui/views/controls/webview/webview.gyp:webview', 1154 '../ui/views/controls/webview/webview.gyp:webview',
1155 '../ui/views/controls/webview/webview.gyp:webview', 1155 '../ui/views/controls/webview/webview.gyp:webview',
1156 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', 1156 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
1157 '../url/url.gyp:url_lib', 1157 '../url/url.gyp:url_lib',
1158 '../v8/tools/gyp/v8.gyp:v8', 1158 '../v8/tools/gyp/v8.gyp:v8',
1159 'chrome_resources.gyp:chrome_strings', 1159 'chrome_resources.gyp:chrome_strings',
1160 ], 1160 ],
1161 'defines': [
1162 '<@(nacl_defines)',
1163 ],
1164 'direct_dependent_settings': {
1165 'defines': [
1166 '<@(nacl_defines)',
1167 ],
1168 },
1169 'export_dependent_settings': [ 1161 'export_dependent_settings': [
1170 'browser/extensions/api/api_registration.gyp:chrome_api_registration', 1162 'browser/extensions/api/api_registration.gyp:chrome_api_registration',
1171 'common/extensions/api/api.gyp:chrome_api', 1163 'common/extensions/api/api.gyp:chrome_api',
1172 '../sync/sync.gyp:sync', 1164 '../sync/sync.gyp:sync',
1173 ], 1165 ],
1174 'include_dirs': [ 1166 'include_dirs': [
1175 # breakpad_linux.cc uses generated file_version_info_linux.h. 1167 # breakpad_linux.cc uses generated file_version_info_linux.h.
1176 '<(SHARED_INTERMEDIATE_DIR)', 1168 '<(SHARED_INTERMEDIATE_DIR)',
1177 '../breakpad/src', 1169 '../breakpad/src',
1178 ], 1170 ],
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
1293 'browser/chromeos/attestation/attestation_signed_data.proto', 1285 'browser/chromeos/attestation/attestation_signed_data.proto',
1294 ], 1286 ],
1295 'variables': { 1287 'variables': {
1296 'proto_in_dir': 'browser/chromeos/attestation', 1288 'proto_in_dir': 'browser/chromeos/attestation',
1297 'proto_out_dir': 'chrome/browser/chromeos/attestation', 1289 'proto_out_dir': 'chrome/browser/chromeos/attestation',
1298 }, 1290 },
1299 'includes': [ '../build/protoc.gypi' ] 1291 'includes': [ '../build/protoc.gypi' ]
1300 }, 1292 },
1301 ], 1293 ],
1302 } 1294 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698