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

Side by Side Diff: build/common.gypi

Issue 1067763004: Remove the deprecated use_nss and USE_NSS flags. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-nss-certs-2
Patch Set: 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 | « no previous file | 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 665 matching lines...) Expand 10 before | Expand all | Expand 10 after
676 # A flag for BSD platforms 676 # A flag for BSD platforms
677 ['OS=="freebsd" or OS=="openbsd"', { 677 ['OS=="freebsd" or OS=="openbsd"', {
678 'os_bsd%': 1, 678 'os_bsd%': 1,
679 }, { 679 }, {
680 'os_bsd%': 0, 680 'os_bsd%': 0,
681 }], 681 }],
682 682
683 # NSS usage. 683 # NSS usage.
684 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and u se_openssl==0', { 684 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and u se_openssl==0', {
685 'use_nss_certs%': 1, 685 'use_nss_certs%': 1,
686 # TODO(davidben): use_nss is deprecated and will be removed. See
687 # https://crbug.com/462040.
688 'use_nss%': 1,
689 }, { 686 }, {
690 'use_nss_certs%': 0, 687 'use_nss_certs%': 0,
691 # TODO(davidben): use_nss is deprecated and will be removed. See
692 # https://crbug.com/462040.
693 'use_nss%': 0,
694 }], 688 }],
695 689
696 # When OpenSSL is used for SSL and crypto on Unix-like systems, use 690 # When OpenSSL is used for SSL and crypto on Unix-like systems, use
697 # OpenSSL's certificate definition. 691 # OpenSSL's certificate definition.
698 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and u se_openssl==1', { 692 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and u se_openssl==1', {
699 'use_openssl_certs%': 1, 693 'use_openssl_certs%': 1,
700 }, { 694 }, {
701 'use_openssl_certs%': 0, 695 'use_openssl_certs%': 0,
702 }], 696 }],
703 697
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
1084 'mips_dsp_rev%': '<(mips_dsp_rev)', 1078 'mips_dsp_rev%': '<(mips_dsp_rev)',
1085 'host_arch%': '<(host_arch)', 1079 'host_arch%': '<(host_arch)',
1086 'toolkit_views%': '<(toolkit_views)', 1080 'toolkit_views%': '<(toolkit_views)',
1087 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', 1081 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
1088 'use_aura%': '<(use_aura)', 1082 'use_aura%': '<(use_aura)',
1089 'use_ash%': '<(use_ash)', 1083 'use_ash%': '<(use_ash)',
1090 'use_cras%': '<(use_cras)', 1084 'use_cras%': '<(use_cras)',
1091 'use_libpci%': '<(use_libpci)', 1085 'use_libpci%': '<(use_libpci)',
1092 'use_openssl%': '<(use_openssl)', 1086 'use_openssl%': '<(use_openssl)',
1093 'use_openssl_certs%': '<(use_openssl_certs)', 1087 'use_openssl_certs%': '<(use_openssl_certs)',
1094 'use_nss%': '<(use_nss)',
1095 'use_nss_certs%': '<(use_nss_certs)', 1088 'use_nss_certs%': '<(use_nss_certs)',
1096 'use_udev%': '<(use_udev)', 1089 'use_udev%': '<(use_udev)',
1097 'os_bsd%': '<(os_bsd)', 1090 'os_bsd%': '<(os_bsd)',
1098 'os_posix%': '<(os_posix)', 1091 'os_posix%': '<(os_posix)',
1099 'use_dbus%': '<(use_dbus)', 1092 'use_dbus%': '<(use_dbus)',
1100 'use_glib%': '<(use_glib)', 1093 'use_glib%': '<(use_glib)',
1101 'use_pango%': '<(use_pango)', 1094 'use_pango%': '<(use_pango)',
1102 'use_cairo%': '<(use_cairo)', 1095 'use_cairo%': '<(use_cairo)',
1103 'use_ozone%': '<(use_ozone)', 1096 'use_ozone%': '<(use_ozone)',
1104 'use_ozone_evdev%': '<(use_ozone_evdev)', 1097 'use_ozone_evdev%': '<(use_ozone_evdev)',
(...skipping 1893 matching lines...) Expand 10 before | Expand all | Expand 10 after
2998 ['>(nacl_untrusted_build)==1', { 2991 ['>(nacl_untrusted_build)==1', {
2999 'defines': [ 2992 'defines': [
3000 'USE_OPENSSL=1', 2993 'USE_OPENSSL=1',
3001 'USE_OPENSSL_CERTS=1', 2994 'USE_OPENSSL_CERTS=1',
3002 ], 2995 ],
3003 }], 2996 }],
3004 ['<(use_glib)==1 and >(nacl_untrusted_build)==0', { 2997 ['<(use_glib)==1 and >(nacl_untrusted_build)==0', {
3005 'defines': ['USE_GLIB=1'], 2998 'defines': ['USE_GLIB=1'],
3006 }], 2999 }],
3007 ['<(use_nss_certs)==1 and >(nacl_untrusted_build)==0', { 3000 ['<(use_nss_certs)==1 and >(nacl_untrusted_build)==0', {
3008 'defines': [ 3001 'defines': ['USE_NSS_CERTS=1'],
3009 'USE_NSS_CERTS=1',
3010 # TODO(davidben): USE_NSS is a deprecated alias for USE_NSS_CERTS and
3011 # will be removed. See https://crbug.com/462040.
3012 'USE_NSS=1',
3013 ],
3014 }], 3002 }],
3015 ['<(chromeos)==1 and >(nacl_untrusted_build)==0', { 3003 ['<(chromeos)==1 and >(nacl_untrusted_build)==0', {
3016 'defines': ['OS_CHROMEOS=1'], 3004 'defines': ['OS_CHROMEOS=1'],
3017 }], 3005 }],
3018 ['enable_wexit_time_destructors==1 and OS!="win"', { 3006 ['enable_wexit_time_destructors==1 and OS!="win"', {
3019 # TODO: Enable on Windows too, http://crbug.com/404525 3007 # TODO: Enable on Windows too, http://crbug.com/404525
3020 'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']}, 3008 'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']},
3021 }], 3009 }],
3022 ['chromium_code==0', { 3010 ['chromium_code==0', {
3023 'conditions': [ 3011 'conditions': [
(...skipping 3071 matching lines...) Expand 10 before | Expand all | Expand 10 after
6095 # settings in target dicts. SYMROOT is a special case, because many other 6083 # settings in target dicts. SYMROOT is a special case, because many other
6096 # Xcode variables depend on it, including variables such as 6084 # Xcode variables depend on it, including variables such as
6097 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6085 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6098 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6086 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6099 # files to appear (when present) in the UI as actual files and not red 6087 # files to appear (when present) in the UI as actual files and not red
6100 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6088 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6101 # and therefore SYMROOT, needs to be set at the project level. 6089 # and therefore SYMROOT, needs to be set at the project level.
6102 'SYMROOT': '<(DEPTH)/xcodebuild', 6090 'SYMROOT': '<(DEPTH)/xcodebuild',
6103 }, 6091 },
6104 } 6092 }
OLDNEW
« no previous file with comments | « no previous file | build/config/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698