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

Side by Side Diff: build/common.gypi

Issue 24710002: Initial stubs for App Launcher on Linux Aura. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Disable AppListControllerSearchResultsBrowserTest. Created 7 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 | « no previous file | chrome/browser/ui/app_list/app_list_controller_browsertest.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) 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 # For now, Windows builds that |use_aura| should also imply using 78 # For now, Windows builds that |use_aura| should also imply using
79 # ash. This rule should be removed for the future when Windows is 79 # ash. This rule should be removed for the future when Windows is
80 # using the aura windows without the ash interface. 80 # using the aura windows without the ash interface.
81 ['use_aura==1 and OS=="win"', { 81 ['use_aura==1 and OS=="win"', {
82 'use_ash%': 1, 82 'use_ash%': 1,
83 }], 83 }],
84 ['use_ash==1', { 84 ['use_ash==1', {
85 'use_aura%': 1, 85 'use_aura%': 1,
86 }], 86 }],
87 87
88 # Whether we're a traditional desktop unix.
89 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") a nd chromeos==0', {
90 'desktop_linux%': 1,
91 }, {
92 'desktop_linux%': 0,
93 }],
94
88 # Compute the architecture that we're building on. 95 # Compute the architecture that we're building on.
89 ['OS=="win" or OS=="mac" or OS=="ios"', { 96 ['OS=="win" or OS=="mac" or OS=="ios"', {
90 'host_arch%': 'ia32', 97 'host_arch%': 'ia32',
91 }, { 98 }, {
92 # This handles the Unix platforms for which there is some support. 99 # This handles the Unix platforms for which there is some support.
93 # Anything else gets passed through, which probably won't work 100 # Anything else gets passed through, which probably won't work
94 # very well; such hosts should pass an explicit target_arch to 101 # very well; such hosts should pass an explicit target_arch to
95 # gyp. 102 # gyp.
96 'host_arch%': 103 'host_arch%':
97 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s /arm.*/arm/;s/i86pc/ia32/")', 104 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s /arm.*/arm/;s/i86pc/ia32/")',
98 }], 105 }],
99 ], 106 ],
100 }, 107 },
101 # Copy conditionally-set variables out one scope. 108 # Copy conditionally-set variables out one scope.
102 'chromeos%': '<(chromeos)', 109 'chromeos%': '<(chromeos)',
110 'desktop_linux%': '<(desktop_linux)',
103 'use_aura%': '<(use_aura)', 111 'use_aura%': '<(use_aura)',
104 'use_ash%': '<(use_ash)', 112 'use_ash%': '<(use_ash)',
105 'use_cras%': '<(use_cras)', 113 'use_cras%': '<(use_cras)',
106 'use_ozone%': '<(use_ozone)', 114 'use_ozone%': '<(use_ozone)',
107 'use_openssl%': '<(use_openssl)', 115 'use_openssl%': '<(use_openssl)',
108 'enable_viewport%': '<(enable_viewport)', 116 'enable_viewport%': '<(enable_viewport)',
109 'enable_hidpi%': '<(enable_hidpi)', 117 'enable_hidpi%': '<(enable_hidpi)',
110 'enable_touch_ui%': '<(enable_touch_ui)', 118 'enable_touch_ui%': '<(enable_touch_ui)',
111 'buildtype%': '<(buildtype)', 119 'buildtype%': '<(buildtype)',
112 'branding%': '<(branding)', 120 'branding%': '<(branding)',
(...skipping 17 matching lines...) Expand all
130 138
131 'conditions': [ 139 'conditions': [
132 # Set default value of toolkit_views based on OS. 140 # Set default value of toolkit_views based on OS.
133 ['OS=="win" or chromeos==1 or use_aura==1', { 141 ['OS=="win" or chromeos==1 or use_aura==1', {
134 'toolkit_views%': 1, 142 'toolkit_views%': 1,
135 }, { 143 }, {
136 'toolkit_views%': 0, 144 'toolkit_views%': 0,
137 }], 145 }],
138 146
139 # Set toolkit_uses_gtk for the Chromium browser on Linux. 147 # Set toolkit_uses_gtk for the Chromium browser on Linux.
140 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0 and use_ozone==0', { 148 ['desktop_linux==1 and use_aura==0 and use_ozone==0', {
141 'toolkit_uses_gtk%': 1, 149 'toolkit_uses_gtk%': 1,
142 }, { 150 }, {
143 'toolkit_uses_gtk%': 0, 151 'toolkit_uses_gtk%': 0,
144 }], 152 }],
145 153
146 # Whether we're a traditional desktop unix.
147 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and chromeos==0', {
148 'desktop_linux%': 1,
149 }, {
150 'desktop_linux%': 0,
151 }],
152
153 # Enable HiDPI on Mac OS and Chrome OS. 154 # Enable HiDPI on Mac OS and Chrome OS.
154 ['OS=="mac" or chromeos==1', { 155 ['OS=="mac" or chromeos==1', {
155 'enable_hidpi%': 1, 156 'enable_hidpi%': 1,
156 }], 157 }],
157 158
158 # Enable touch UI on Metro. 159 # Enable touch UI on Metro.
159 ['OS=="win"', { 160 ['OS=="win"', {
160 'enable_touch_ui%': 1, 161 'enable_touch_ui%': 1,
161 }], 162 }],
162 163
163 # Enable App Launcher only on ChromeOS, Windows and OSX. 164 # Enable App Launcher on ChromeOS, Windows and OSX.
164 ['use_ash==1 or OS=="win" or OS=="mac"', { 165 # On Linux, enable App Launcher for the Aura build.
166 ['use_ash==1 or OS=="win" or OS=="mac" or (desktop_linux==1 and use_au ra==1)', {
165 'enable_app_list%': 1, 167 'enable_app_list%': 1,
166 }, { 168 }, {
167 'enable_app_list%': 0, 169 'enable_app_list%': 0,
168 }], 170 }],
169 171
170 ['use_aura==1 or (OS!="win" and OS!="mac" and OS!="ios" and OS!="andro id")', { 172 ['use_aura==1 or (OS!="win" and OS!="mac" and OS!="ios" and OS!="andro id")', {
171 'use_default_render_theme%': 1, 173 'use_default_render_theme%': 1,
172 }, { 174 }, {
173 'use_default_render_theme%': 0, 175 'use_default_render_theme%': 0,
174 }], 176 }],
(...skipping 4557 matching lines...) Expand 10 before | Expand all | Expand 10 after
4732 # settings in target dicts. SYMROOT is a special case, because many other 4734 # settings in target dicts. SYMROOT is a special case, because many other
4733 # Xcode variables depend on it, including variables such as 4735 # Xcode variables depend on it, including variables such as
4734 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4736 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4735 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4737 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4736 # files to appear (when present) in the UI as actual files and not red 4738 # files to appear (when present) in the UI as actual files and not red
4737 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4739 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4738 # and therefore SYMROOT, needs to be set at the project level. 4740 # and therefore SYMROOT, needs to be set at the project level.
4739 'SYMROOT': '<(DEPTH)/xcodebuild', 4741 'SYMROOT': '<(DEPTH)/xcodebuild',
4740 }, 4742 },
4741 } 4743 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/app_list/app_list_controller_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698