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

Side by Side Diff: build/common.gypi

Issue 1082123003: Rename USE_NSS to USE_NSS_CERTS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-nss-certs
Patch Set: rebase Created 5 years, 8 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 | « build/build_config.h ('k') | build/config/BUILD.gn » ('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 2998 matching lines...) Expand 10 before | Expand all | Expand 10 after
3009 ['>(nacl_untrusted_build)==1', { 3009 ['>(nacl_untrusted_build)==1', {
3010 'defines': [ 3010 'defines': [
3011 'USE_OPENSSL=1', 3011 'USE_OPENSSL=1',
3012 'USE_OPENSSL_CERTS=1', 3012 'USE_OPENSSL_CERTS=1',
3013 ], 3013 ],
3014 }], 3014 }],
3015 ['<(use_glib)==1 and >(nacl_untrusted_build)==0', { 3015 ['<(use_glib)==1 and >(nacl_untrusted_build)==0', {
3016 'defines': ['USE_GLIB=1'], 3016 'defines': ['USE_GLIB=1'],
3017 }], 3017 }],
3018 ['<(use_nss_certs)==1 and >(nacl_untrusted_build)==0', { 3018 ['<(use_nss_certs)==1 and >(nacl_untrusted_build)==0', {
3019 # TODO(davidben): Rename this to USE_NSS_CERTS. https://crbug.com/462040 3019 'defines': [
3020 'defines': ['USE_NSS=1'], 3020 'USE_NSS_CERTS=1',
3021 # TODO(davidben): USE_NSS is a deprecated alias for USE_NSS_CERTS and
3022 # will be removed. See https://crbug.com/462040.
3023 'USE_NSS=1',
3024 ],
3021 }], 3025 }],
3022 ['<(chromeos)==1 and >(nacl_untrusted_build)==0', { 3026 ['<(chromeos)==1 and >(nacl_untrusted_build)==0', {
3023 'defines': ['OS_CHROMEOS=1'], 3027 'defines': ['OS_CHROMEOS=1'],
3024 }], 3028 }],
3025 ['enable_wexit_time_destructors==1 and OS!="win"', { 3029 ['enable_wexit_time_destructors==1 and OS!="win"', {
3026 # TODO: Enable on Windows too, http://crbug.com/404525 3030 # TODO: Enable on Windows too, http://crbug.com/404525
3027 'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']}, 3031 'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']},
3028 }], 3032 }],
3029 ['chromium_code==0', { 3033 ['chromium_code==0', {
3030 'conditions': [ 3034 'conditions': [
(...skipping 3083 matching lines...) Expand 10 before | Expand all | Expand 10 after
6114 # settings in target dicts. SYMROOT is a special case, because many other 6118 # settings in target dicts. SYMROOT is a special case, because many other
6115 # Xcode variables depend on it, including variables such as 6119 # Xcode variables depend on it, including variables such as
6116 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6120 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6117 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6121 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6118 # files to appear (when present) in the UI as actual files and not red 6122 # files to appear (when present) in the UI as actual files and not red
6119 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6123 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6120 # and therefore SYMROOT, needs to be set at the project level. 6124 # and therefore SYMROOT, needs to be set at the project level.
6121 'SYMROOT': '<(DEPTH)/xcodebuild', 6125 'SYMROOT': '<(DEPTH)/xcodebuild',
6122 }, 6126 },
6123 } 6127 }
OLDNEW
« no previous file with comments | « build/build_config.h ('k') | build/config/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698