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

Side by Side Diff: build/common.gypi

Issue 10270002: Get the custom frame limping with win-aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 | ui/gfx/screen_aura.cc » ('j') | ui/gfx/screen_aura.cc » ('J')
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 # 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 # Chromeos implies ash. 73 # Chromeos implies ash.
74 ['chromeos==1', { 74 ['chromeos==1', {
75 'use_ash%': 1, 75 'use_ash%': 1,
76 'use_aura%': 1, 76 'use_aura%': 1,
77 }], 77 }],
78 78
79 # For now, Windows *AND* Linux builds that |use_aura| should also 79 # For now, Windows *AND* Linux builds that |use_aura| should also
80 # imply using ash. This rule should be removed for the future when 80 # imply using ash. This rule should be removed for the future when
81 # both Linux and Windows are using the aura windows without the ash 81 # both Linux and Windows are using the aura windows without the ash
82 # interface. 82 # interface.
83 ['use_aura==1 and ((OS=="linux" and chromeos==0) or OS=="win")', { 83 ['use_aura==1 and ((OS=="linux" and chromeos==0))', {
84 'use_ash%': 1, 84 'use_ash%': 1,
85 }], 85 }],
86 86
87 # Set default value of toolkit_views based on OS. 87 # Set default value of toolkit_views based on OS.
88 ['OS=="win" or chromeos==1 or use_aura==1', { 88 ['OS=="win" or chromeos==1 or use_aura==1', {
89 'toolkit_views%': 1, 89 'toolkit_views%': 1,
90 }, { 90 }, {
91 'toolkit_views%': 0, 91 'toolkit_views%': 0,
92 }], 92 }],
93 93
(...skipping 2939 matching lines...) Expand 10 before | Expand all | Expand 10 after
3033 # settings in target dicts. SYMROOT is a special case, because many other 3033 # settings in target dicts. SYMROOT is a special case, because many other
3034 # Xcode variables depend on it, including variables such as 3034 # Xcode variables depend on it, including variables such as
3035 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3035 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3036 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3036 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3037 # files to appear (when present) in the UI as actual files and not red 3037 # files to appear (when present) in the UI as actual files and not red
3038 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3038 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3039 # and therefore SYMROOT, needs to be set at the project level. 3039 # and therefore SYMROOT, needs to be set at the project level.
3040 'SYMROOT': '<(DEPTH)/xcodebuild', 3040 'SYMROOT': '<(DEPTH)/xcodebuild',
3041 }, 3041 },
3042 } 3042 }
OLDNEW
« no previous file with comments | « no previous file | ui/gfx/screen_aura.cc » ('j') | ui/gfx/screen_aura.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698