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

Side by Side Diff: build/common.gypi

Issue 7976025: Revert 102113 - Aura: Use extension-based file picker from CrOS for pure-views builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 3 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/browser_resources.grd » ('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 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 'use_titlecase_in_grd_files%': 1, 255 'use_titlecase_in_grd_files%': 1,
256 }], 256 }],
257 257
258 # Enable some hacks to support Flapper only on Chrome OS. 258 # Enable some hacks to support Flapper only on Chrome OS.
259 ['chromeos==1', { 259 ['chromeos==1', {
260 'enable_flapper_hacks%': 1, 260 'enable_flapper_hacks%': 1,
261 }, { 261 }, {
262 'enable_flapper_hacks%': 0, 262 'enable_flapper_hacks%': 0,
263 }], 263 }],
264 264
265 # Enable file manager extension on Chrome OS, Touch, PureView, Aura. 265 # Enable file manager extension by default on Chrome OS.
266 ['chromeos==1 or touchui==1 or use_only_pure_views==1 or use_aura==1', { 266 ['chromeos==1', {
267 'file_manager_extension%': 1, 267 'file_manager_extension%': 1,
268 }, { 268 }, {
269 'file_manager_extension%': 0, 269 'file_manager_extension%': 0,
270 }], 270 }],
271 271
272 # Enable WebUI TaskManager only on Chrome OS, Touch or PureView. 272 # Enable WebUI TaskManager only on Chrome OS, Touch or PureView.
273 ['chromeos==1 or touchui==1 or use_only_pure_views==1 or use_aura==1', { 273 ['chromeos==1 or touchui==1 or use_only_pure_views==1 or use_aura==1', {
274 'webui_task_manager%': 1, 274 'webui_task_manager%': 1,
275 }, { 275 }, {
276 'webui_task_manager%': 0, 276 'webui_task_manager%': 0,
(...skipping 2113 matching lines...) Expand 10 before | Expand all | Expand 10 after
2390 # settings in target dicts. SYMROOT is a special case, because many other 2390 # settings in target dicts. SYMROOT is a special case, because many other
2391 # Xcode variables depend on it, including variables such as 2391 # Xcode variables depend on it, including variables such as
2392 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2392 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2393 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2393 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2394 # files to appear (when present) in the UI as actual files and not red 2394 # files to appear (when present) in the UI as actual files and not red
2395 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2395 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2396 # and therefore SYMROOT, needs to be set at the project level. 2396 # and therefore SYMROOT, needs to be set at the project level.
2397 'SYMROOT': '<(DEPTH)/xcodebuild', 2397 'SYMROOT': '<(DEPTH)/xcodebuild',
2398 }, 2398 },
2399 } 2399 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browser_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698