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

Side by Side Diff: build/common.gypi

Issue 565473002: Revert of Switch Mac over to BoringSSL from NSS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « no previous file | build/config/crypto.gni » ('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 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 'use_aura%': 1, 203 'use_aura%': 1,
204 'use_ash%': 0, 204 'use_ash%': 0,
205 'toolkit_views%': 0, 205 'toolkit_views%': 0,
206 }], 206 }],
207 207
208 # Enable HiDPI on Mac OS, Chrome OS and Windows. 208 # Enable HiDPI on Mac OS, Chrome OS and Windows.
209 ['OS=="mac" or chromeos==1 or OS=="win"', { 209 ['OS=="mac" or chromeos==1 or OS=="win"', {
210 'enable_hidpi%': 1, 210 'enable_hidpi%': 1,
211 }], 211 }],
212 212
213 # Enable the OpenSSL backend on Mac OS.
214 ['OS=="mac"', {
215 'use_openssl%': 1,
216 }],
217
218 # Enable App Launcher everywhere but mobile. 213 # Enable App Launcher everywhere but mobile.
219 ['OS!="ios" and OS!="android"', { 214 ['OS!="ios" and OS!="android"', {
220 'enable_app_list%': 1, 215 'enable_app_list%': 1,
221 }, { 216 }, {
222 'enable_app_list%': 0, 217 'enable_app_list%': 0,
223 }], 218 }],
224 219
225 ['use_aura==1 or (OS!="win" and OS!="mac" and OS!="ios" and OS!="andro id")', { 220 ['use_aura==1 or (OS!="win" and OS!="mac" and OS!="ios" and OS!="andro id")', {
226 'use_default_render_theme%': 1, 221 'use_default_render_theme%': 1,
227 }, { 222 }, {
(...skipping 5549 matching lines...) Expand 10 before | Expand all | Expand 10 after
5777 # settings in target dicts. SYMROOT is a special case, because many other 5772 # settings in target dicts. SYMROOT is a special case, because many other
5778 # Xcode variables depend on it, including variables such as 5773 # Xcode variables depend on it, including variables such as
5779 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5774 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5780 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5775 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5781 # files to appear (when present) in the UI as actual files and not red 5776 # files to appear (when present) in the UI as actual files and not red
5782 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5777 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5783 # and therefore SYMROOT, needs to be set at the project level. 5778 # and therefore SYMROOT, needs to be set at the project level.
5784 'SYMROOT': '<(DEPTH)/xcodebuild', 5779 'SYMROOT': '<(DEPTH)/xcodebuild',
5785 }, 5780 },
5786 } 5781 }
OLDNEW
« no previous file with comments | « no previous file | build/config/crypto.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698