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

Side by Side Diff: build/common.gypi

Issue 1882433002: Removing NSS files and USE_OPENSSL flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 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/android/pylib/utils/isolator.py ('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 726 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 'os_bsd%': 0, 737 'os_bsd%': 0,
738 }], 738 }],
739 739
740 # NSS usage. 740 # NSS usage.
741 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris")', { 741 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris")', {
742 'use_nss_certs%': 1, 742 'use_nss_certs%': 1,
743 }, { 743 }, {
744 'use_nss_certs%': 0, 744 'use_nss_certs%': 0,
745 }], 745 }],
746 746
747 # NSS verifier usage.
748 # On non-OpenSSL iOS configurations, certificates use the operating
749 # system library, but the verifier uses the bundled copy of NSS.
750 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") or (O S=="ios" and use_openssl==0)', {
751 'use_nss_verifier%': 1,
752 }, {
753 'use_nss_verifier%': 0,
754 }],
755
756 # libudev usage. This currently only affects the content layer. 747 # libudev usage. This currently only affects the content layer.
757 ['OS=="linux" and embedded==0', { 748 ['OS=="linux" and embedded==0', {
758 'use_udev%': 1, 749 'use_udev%': 1,
759 }, { 750 }, {
760 'use_udev%': 0, 751 'use_udev%': 0,
761 }], 752 }],
762 753
763 # Flags to use X11 on non-Mac POSIX platforms. 754 # Flags to use X11 on non-Mac POSIX platforms.
764 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or use_ozone==1', { 755 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or use_ozone==1', {
765 'use_x11%': 0, 756 'use_x11%': 0,
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
1163 'host_arch%': '<(host_arch)', 1154 'host_arch%': '<(host_arch)',
1164 'toolkit_views%': '<(toolkit_views)', 1155 'toolkit_views%': '<(toolkit_views)',
1165 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', 1156 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
1166 'use_aura%': '<(use_aura)', 1157 'use_aura%': '<(use_aura)',
1167 'use_ash%': '<(use_ash)', 1158 'use_ash%': '<(use_ash)',
1168 'use_cras%': '<(use_cras)', 1159 'use_cras%': '<(use_cras)',
1169 'use_libpci%': '<(use_libpci)', 1160 'use_libpci%': '<(use_libpci)',
1170 'use_openssl%': '<(use_openssl)', 1161 'use_openssl%': '<(use_openssl)',
1171 'use_openssl_certs%': '<(use_openssl_certs)', 1162 'use_openssl_certs%': '<(use_openssl_certs)',
1172 'use_nss_certs%': '<(use_nss_certs)', 1163 'use_nss_certs%': '<(use_nss_certs)',
1173 'use_nss_verifier%': '<(use_nss_verifier)',
1174 'use_udev%': '<(use_udev)', 1164 'use_udev%': '<(use_udev)',
1175 'os_bsd%': '<(os_bsd)', 1165 'os_bsd%': '<(os_bsd)',
1176 'os_posix%': '<(os_posix)', 1166 'os_posix%': '<(os_posix)',
1177 'use_dbus%': '<(use_dbus)', 1167 'use_dbus%': '<(use_dbus)',
1178 'use_glib%': '<(use_glib)', 1168 'use_glib%': '<(use_glib)',
1179 'use_pango%': '<(use_pango)', 1169 'use_pango%': '<(use_pango)',
1180 'use_cairo%': '<(use_cairo)', 1170 'use_cairo%': '<(use_cairo)',
1181 'use_ozone%': '<(use_ozone)', 1171 'use_ozone%': '<(use_ozone)',
1182 'use_ozone_evdev%': '<(use_ozone_evdev)', 1172 'use_ozone_evdev%': '<(use_ozone_evdev)',
1183 'use_xkbcommon%': '<(use_xkbcommon)', 1173 'use_xkbcommon%': '<(use_xkbcommon)',
(...skipping 948 matching lines...) Expand 10 before | Expand all | Expand 10 after
2132 }], 2122 }],
2133 ['use_aura==1', { 2123 ['use_aura==1', {
2134 'grit_defines': ['-D', 'use_aura'], 2124 'grit_defines': ['-D', 'use_aura'],
2135 }], 2125 }],
2136 ['use_ash==1', { 2126 ['use_ash==1', {
2137 'grit_defines': ['-D', 'use_ash'], 2127 'grit_defines': ['-D', 'use_ash'],
2138 }], 2128 }],
2139 ['use_nss_certs==1', { 2129 ['use_nss_certs==1', {
2140 'grit_defines': ['-D', 'use_nss_certs'], 2130 'grit_defines': ['-D', 'use_nss_certs'],
2141 }], 2131 }],
2142 ['use_nss_verifier==1', {
2143 'grit_defines': ['-D', 'use_nss_verifier'],
2144 }],
2145 ['use_ozone==1', { 2132 ['use_ozone==1', {
2146 'grit_defines': ['-D', 'use_ozone'], 2133 'grit_defines': ['-D', 'use_ozone'],
2147 }], 2134 }],
2148 ['image_loader_extension==1', { 2135 ['image_loader_extension==1', {
2149 'grit_defines': ['-D', 'image_loader_extension'], 2136 'grit_defines': ['-D', 'image_loader_extension'],
2150 }], 2137 }],
2151 ['use_titlecase_in_grd==1', { 2138 ['use_titlecase_in_grd==1', {
2152 'grit_defines': ['-D', 'use_titlecase'], 2139 'grit_defines': ['-D', 'use_titlecase'],
2153 }], 2140 }],
2154 ['OS=="android"', { 2141 ['OS=="android"', {
(...skipping 913 matching lines...) Expand 10 before | Expand all | Expand 10 after
3068 ['safe_browsing==2 and OS!="ios"', { 3055 ['safe_browsing==2 and OS!="ios"', {
3069 'defines': [ 3056 'defines': [
3070 'SAFE_BROWSING_DB_REMOTE', 3057 'SAFE_BROWSING_DB_REMOTE',
3071 ], 3058 ],
3072 }], 3059 }],
3073 ], # conditions for 'target_defaults' 3060 ], # conditions for 'target_defaults'
3074 'target_conditions': [ 3061 'target_conditions': [
3075 ['<(use_libpci)==1', { 3062 ['<(use_libpci)==1', {
3076 'defines': ['USE_LIBPCI=1'], 3063 'defines': ['USE_LIBPCI=1'],
3077 }], 3064 }],
3078 ['<(use_openssl)==1', {
3079 'defines': ['USE_OPENSSL=1'],
3080 }],
3081 ['<(use_openssl_certs)==1', { 3065 ['<(use_openssl_certs)==1', {
3082 'defines': ['USE_OPENSSL_CERTS=1'], 3066 'defines': ['USE_OPENSSL_CERTS=1'],
3083 }], 3067 }],
3084 ['>(nacl_untrusted_build)==1', { 3068 ['>(nacl_untrusted_build)==1', {
3085 'defines': [ 3069 'defines': [
3086 'USE_OPENSSL=1',
3087 'USE_OPENSSL_CERTS=1', 3070 'USE_OPENSSL_CERTS=1',
3088 ], 3071 ],
3089 }], 3072 }],
3090 ['<(use_glib)==1 and >(nacl_untrusted_build)==0', { 3073 ['<(use_glib)==1 and >(nacl_untrusted_build)==0', {
3091 'defines': ['USE_GLIB=1'], 3074 'defines': ['USE_GLIB=1'],
3092 }], 3075 }],
3093 ['<(use_nss_certs)==1 and >(nacl_untrusted_build)==0', { 3076 ['<(use_nss_certs)==1 and >(nacl_untrusted_build)==0', {
3094 'defines': ['USE_NSS_CERTS=1'], 3077 'defines': ['USE_NSS_CERTS=1'],
3095 }], 3078 }],
3096 ['<(use_nss_verifier)==1 and >(nacl_untrusted_build)==0', {
3097 'defines': ['USE_NSS_VERIFIER=1'],
3098 }],
3099 ['<(chromeos)==1 and >(nacl_untrusted_build)==0', { 3079 ['<(chromeos)==1 and >(nacl_untrusted_build)==0', {
3100 'defines': ['OS_CHROMEOS=1'], 3080 'defines': ['OS_CHROMEOS=1'],
3101 }], 3081 }],
3102 ['enable_wexit_time_destructors==1 and OS!="win"', { 3082 ['enable_wexit_time_destructors==1 and OS!="win"', {
3103 # TODO: Enable on Windows too, http://crbug.com/404525 3083 # TODO: Enable on Windows too, http://crbug.com/404525
3104 'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']}, 3084 'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']},
3105 }], 3085 }],
3106 ['"<!(python <(DEPTH)/tools/clang/scripts/update.py --print-revision)"!="2 66460-1"', { 3086 ['"<!(python <(DEPTH)/tools/clang/scripts/update.py --print-revision)"!="2 66460-1"', {
3107 # TODO(thakis): https://crbug.com/604888 3087 # TODO(thakis): https://crbug.com/604888
3108 'variables': { 'clang_warning_flags': ['-Wno-undefined-var-template']}, 3088 'variables': { 'clang_warning_flags': ['-Wno-undefined-var-template']},
(...skipping 3237 matching lines...) Expand 10 before | Expand all | Expand 10 after
6346 # settings in target dicts. SYMROOT is a special case, because many other 6326 # settings in target dicts. SYMROOT is a special case, because many other
6347 # Xcode variables depend on it, including variables such as 6327 # Xcode variables depend on it, including variables such as
6348 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6328 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6349 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6329 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6350 # files to appear (when present) in the UI as actual files and not red 6330 # files to appear (when present) in the UI as actual files and not red
6351 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6331 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6352 # and therefore SYMROOT, needs to be set at the project level. 6332 # and therefore SYMROOT, needs to be set at the project level.
6353 'SYMROOT': '<(DEPTH)/xcodebuild', 6333 'SYMROOT': '<(DEPTH)/xcodebuild',
6354 }, 6334 },
6355 } 6335 }
OLDNEW
« no previous file with comments | « build/android/pylib/utils/isolator.py ('k') | build/config/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698