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

Side by Side Diff: build/common.gypi

Issue 8174005: Get Chrome to build & link with USE_AURA on Windows again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.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) 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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 'enable_flapper_hacks%': 0, 302 'enable_flapper_hacks%': 0,
303 }], 303 }],
304 304
305 # Enable file manager extension on Chrome OS, Touch, PureView, Aura. 305 # Enable file manager extension on Chrome OS, Touch, PureView, Aura.
306 ['chromeos==1 or touchui==1 or use_only_pure_views==1 or use_aura==1', { 306 ['chromeos==1 or touchui==1 or use_only_pure_views==1 or use_aura==1', {
307 'file_manager_extension%': 1, 307 'file_manager_extension%': 1,
308 }, { 308 }, {
309 'file_manager_extension%': 0, 309 'file_manager_extension%': 0,
310 }], 310 }],
311 311
312 # ... except on Windows even with Aura.
313 ['use_aura==1 and OS=="win"', {
314 'file_manager_extension%': 0,
315 }],
316
312 # Enable WebUI TaskManager only on Chrome OS, Touch or PureView. 317 # Enable WebUI TaskManager only on Chrome OS, Touch or PureView.
313 ['chromeos==1 or touchui==1 or use_only_pure_views==1 or use_aura==1', { 318 ['chromeos==1 or touchui==1 or use_only_pure_views==1 or use_aura==1', {
314 'webui_task_manager%': 1, 319 'webui_task_manager%': 1,
315 }, { 320 }, {
316 'webui_task_manager%': 0, 321 'webui_task_manager%': 0,
317 }], 322 }],
318 323
319 ['OS=="android"', { 324 ['OS=="android"', {
320 'proprietary_codecs%': 1, 325 'proprietary_codecs%': 1,
321 'enable_webrtc%': 0, 326 'enable_webrtc%': 0,
(...skipping 2173 matching lines...) Expand 10 before | Expand all | Expand 10 after
2495 # settings in target dicts. SYMROOT is a special case, because many other 2500 # settings in target dicts. SYMROOT is a special case, because many other
2496 # Xcode variables depend on it, including variables such as 2501 # Xcode variables depend on it, including variables such as
2497 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2502 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2498 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2503 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2499 # files to appear (when present) in the UI as actual files and not red 2504 # files to appear (when present) in the UI as actual files and not red
2500 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2505 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2501 # and therefore SYMROOT, needs to be set at the project level. 2506 # and therefore SYMROOT, needs to be set at the project level.
2502 'SYMROOT': '<(DEPTH)/xcodebuild', 2507 'SYMROOT': '<(DEPTH)/xcodebuild',
2503 }, 2508 },
2504 } 2509 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698