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

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: long line 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
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 2980 matching lines...) Expand 10 before | Expand all | Expand 10 after
2991 ['>(nacl_untrusted_build)==1', { 2991 ['>(nacl_untrusted_build)==1', {
2992 'defines': [ 2992 'defines': [
2993 'USE_OPENSSL=1', 2993 'USE_OPENSSL=1',
2994 'USE_OPENSSL_CERTS=1', 2994 'USE_OPENSSL_CERTS=1',
2995 ], 2995 ],
2996 }], 2996 }],
2997 ['<(use_glib)==1 and >(nacl_untrusted_build)==0', { 2997 ['<(use_glib)==1 and >(nacl_untrusted_build)==0', {
2998 'defines': ['USE_GLIB=1'], 2998 'defines': ['USE_GLIB=1'],
2999 }], 2999 }],
3000 ['<(use_nss_certs)==1 and >(nacl_untrusted_build)==0', { 3000 ['<(use_nss_certs)==1 and >(nacl_untrusted_build)==0', {
3001 # TODO(davidben): Rename this to USE_NSS_CERTS. https://crbug.com/462040 3001 'defines': ['USE_NSS_CERTS=1'],
Nico 2015/04/16 16:33:11 If you felt cautious, you could define both in thi
davidben 2015/04/16 18:32:01 Yeah, that's a good idea. I think even just the re
3002 'defines': ['USE_NSS=1'],
3003 }], 3002 }],
3004 ['<(chromeos)==1 and >(nacl_untrusted_build)==0', { 3003 ['<(chromeos)==1 and >(nacl_untrusted_build)==0', {
3005 'defines': ['OS_CHROMEOS=1'], 3004 'defines': ['OS_CHROMEOS=1'],
3006 }], 3005 }],
3007 ['enable_wexit_time_destructors==1 and OS!="win"', { 3006 ['enable_wexit_time_destructors==1 and OS!="win"', {
3008 # TODO: Enable on Windows too, http://crbug.com/404525 3007 # TODO: Enable on Windows too, http://crbug.com/404525
3009 'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']}, 3008 'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']},
3010 }], 3009 }],
3011 ['chromium_code==0', { 3010 ['chromium_code==0', {
3012 'conditions': [ 3011 'conditions': [
(...skipping 3070 matching lines...) Expand 10 before | Expand all | Expand 10 after
6083 # settings in target dicts. SYMROOT is a special case, because many other 6082 # settings in target dicts. SYMROOT is a special case, because many other
6084 # Xcode variables depend on it, including variables such as 6083 # Xcode variables depend on it, including variables such as
6085 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6084 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6086 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6085 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6087 # files to appear (when present) in the UI as actual files and not red 6086 # files to appear (when present) in the UI as actual files and not red
6088 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6087 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6089 # and therefore SYMROOT, needs to be set at the project level. 6088 # and therefore SYMROOT, needs to be set at the project level.
6090 'SYMROOT': '<(DEPTH)/xcodebuild', 6089 'SYMROOT': '<(DEPTH)/xcodebuild',
6091 }, 6090 },
6092 } 6091 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698