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

Side by Side Diff: build/common.gypi

Issue 1581803006: common.gypi: check for chromeos==1 rather than OS==chromeos (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@chromeos_use_sysroot
Patch Set: Created 4 years, 11 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 | no next file » | 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 2375 matching lines...) Expand 10 before | Expand all | Expand 10 after
2386 'ozone_platform_egltest%': 1, 2386 'ozone_platform_egltest%': 1,
2387 'ozone_platform_ozonex%': 1, 2387 'ozone_platform_ozonex%': 1,
2388 }, { 2388 }, {
2389 # On device builds, enable "cast" as the default platform. 2389 # On device builds, enable "cast" as the default platform.
2390 'ozone_platform%': 'cast', 2390 'ozone_platform%': 'cast',
2391 }], 2391 }],
2392 ], 2392 ],
2393 }], 2393 }],
2394 ], 2394 ],
2395 }, { # chromecast!=1 2395 }, { # chromecast!=1
2396 # Build all platforms whose deps are in install-build-deps.sh.
2397 # Only these platforms will be compile tested by buildbots.
2398 'ozone_platform_egltest%': 1,
2396 'conditions': [ 2399 'conditions': [
2397 ['OS=="chromeos"', { 2400 ['chromeos==1', {
2398 'ozone_platform_gbm%': 1, 2401 'ozone_platform_gbm%': 1,
2399 'ozone_platform_egltest%': 1,
dnicoara 2016/02/17 22:59:32 Why is this removing ozone_platform_egltest?
Sam Clegg 2016/02/17 23:01:10 It was set in both sides of the condition so I jus
dnicoara 2016/02/18 14:24:35 Ah, I see, sorry, missed it.
2400 }, {
2401 # Build all platforms whose deps are in install-build-deps.sh.
2402 # Only these platforms will be compile tested by buildbots.
2403 'ozone_platform_egltest%': 1,
2404 }], 2402 }],
2405 ], 2403 ],
2406 }], 2404 }],
2407 ], 2405 ],
2408 }], 2406 }],
2409 2407
2410 ['desktop_linux==1 and use_aura==1 and use_x11==1', { 2408 ['desktop_linux==1 and use_aura==1 and use_x11==1', {
2411 'use_clipboard_aurax11%': 1, 2409 'use_clipboard_aurax11%': 1,
2412 }], 2410 }],
2413 2411
(...skipping 3952 matching lines...) Expand 10 before | Expand all | Expand 10 after
6366 # settings in target dicts. SYMROOT is a special case, because many other 6364 # settings in target dicts. SYMROOT is a special case, because many other
6367 # Xcode variables depend on it, including variables such as 6365 # Xcode variables depend on it, including variables such as
6368 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6366 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6369 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6367 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6370 # files to appear (when present) in the UI as actual files and not red 6368 # files to appear (when present) in the UI as actual files and not red
6371 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6369 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6372 # and therefore SYMROOT, needs to be set at the project level. 6370 # and therefore SYMROOT, needs to be set at the project level.
6373 'SYMROOT': '<(DEPTH)/xcodebuild', 6371 'SYMROOT': '<(DEPTH)/xcodebuild',
6374 }, 6372 },
6375 } 6373 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698