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

Side by Side Diff: build/common.gypi

Issue 1466143002: arc-bridge: Enable ARC with a command-line flag (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: Fixed ChromeOS builds Created 5 years, 1 month 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 | build/config/BUILD.gn » ('j') | components/arc/arc_bridge_service.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 1540 matching lines...) Expand 10 before | Expand all | Expand 10 after
1551 'ozone_platform_headless%': 0, 1551 'ozone_platform_headless%': 0,
1552 1552
1553 # Experiment: http://crbug.com/426914 1553 # Experiment: http://crbug.com/426914
1554 'envoy%': 0, 1554 'envoy%': 0,
1555 1555
1556 # Used to set libjpeg_gyp_path. Chrome OS ui/gfx/gfx.gyp uses the IJG path 1556 # Used to set libjpeg_gyp_path. Chrome OS ui/gfx/gfx.gyp uses the IJG path
1557 # for robust login screen decoding. 1557 # for robust login screen decoding.
1558 'libjpeg_ijg_gyp_path': '<(DEPTH)/third_party/libjpeg/libjpeg.gyp', 1558 'libjpeg_ijg_gyp_path': '<(DEPTH)/third_party/libjpeg/libjpeg.gyp',
1559 'libjpeg_turbo_gyp_path': '<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp', 1559 'libjpeg_turbo_gyp_path': '<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp',
1560 1560
1561 # ARC instance disabled by default.
1562 'enable_arc%': 0,
1563
1564 'conditions': [ 1561 'conditions': [
1565 ['buildtype=="Official"', { 1562 ['buildtype=="Official"', {
1566 # Continue to embed build meta data in Official builds, basically the 1563 # Continue to embed build meta data in Official builds, basically the
1567 # time it was built. 1564 # time it was built.
1568 # TODO(maruel): This decision should be revisited because having an 1565 # TODO(maruel): This decision should be revisited because having an
1569 # official deterministic build has high value too but MSVC toolset can't 1566 # official deterministic build has high value too but MSVC toolset can't
1570 # generate anything deterministic with WPO enabled AFAIK. 1567 # generate anything deterministic with WPO enabled AFAIK.
1571 'dont_embed_build_metadata%': 0, 1568 'dont_embed_build_metadata%': 0,
1572 }], 1569 }],
1573 # Enable the Syzygy optimization step for the official builds. 1570 # Enable the Syzygy optimization step for the official builds.
(...skipping 1521 matching lines...) Expand 10 before | Expand all | Expand 10 after
3095 ['<(use_nss_certs)==1 and >(nacl_untrusted_build)==0', { 3092 ['<(use_nss_certs)==1 and >(nacl_untrusted_build)==0', {
3096 'defines': ['USE_NSS_CERTS=1'], 3093 'defines': ['USE_NSS_CERTS=1'],
3097 }], 3094 }],
3098 ['<(chromeos)==1 and >(nacl_untrusted_build)==0', { 3095 ['<(chromeos)==1 and >(nacl_untrusted_build)==0', {
3099 'defines': ['OS_CHROMEOS=1'], 3096 'defines': ['OS_CHROMEOS=1'],
3100 }], 3097 }],
3101 ['enable_wexit_time_destructors==1 and OS!="win"', { 3098 ['enable_wexit_time_destructors==1 and OS!="win"', {
3102 # TODO: Enable on Windows too, http://crbug.com/404525 3099 # TODO: Enable on Windows too, http://crbug.com/404525
3103 'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']}, 3100 'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']},
3104 }], 3101 }],
3105 ['<(enable_arc)==1', {
3106 'defines': ['ENABLE_ARC=1'],
3107 }],
3108 ['chromium_code==0', { 3102 ['chromium_code==0', {
3109 'variables': { 3103 'variables': {
3110 'clang_warning_flags': [ 3104 'clang_warning_flags': [
3111 # Lots of third-party libraries have unused variables. Instead of 3105 # Lots of third-party libraries have unused variables. Instead of
3112 # suppressing them individually, we just blanket suppress them here. 3106 # suppressing them individually, we just blanket suppress them here.
3113 '-Wno-unused-variable', 3107 '-Wno-unused-variable',
3114 ], 3108 ],
3115 }, 3109 },
3116 'conditions': [ 3110 'conditions': [
3117 [ 'os_posix==1 and OS!="mac" and OS!="ios"', { 3111 [ 'os_posix==1 and OS!="mac" and OS!="ios"', {
(...skipping 3255 matching lines...) Expand 10 before | Expand all | Expand 10 after
6373 # settings in target dicts. SYMROOT is a special case, because many other 6367 # settings in target dicts. SYMROOT is a special case, because many other
6374 # Xcode variables depend on it, including variables such as 6368 # Xcode variables depend on it, including variables such as
6375 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6369 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6376 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6370 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6377 # files to appear (when present) in the UI as actual files and not red 6371 # files to appear (when present) in the UI as actual files and not red
6378 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6372 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6379 # and therefore SYMROOT, needs to be set at the project level. 6373 # and therefore SYMROOT, needs to be set at the project level.
6380 'SYMROOT': '<(DEPTH)/xcodebuild', 6374 'SYMROOT': '<(DEPTH)/xcodebuild',
6381 }, 6375 },
6382 } 6376 }
OLDNEW
« no previous file with comments | « no previous file | build/config/BUILD.gn » ('j') | components/arc/arc_bridge_service.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698