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

Side by Side Diff: build/common.gypi

Issue 206453002: Introduce USE_OPENSSL_CERTS for certificate handling. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Final fixes and nits Created 6 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 | crypto/crypto.gyp » ('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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 'use_aura%': '<(use_aura)', 50 'use_aura%': '<(use_aura)',
51 'use_ash%': '<(use_ash)', 51 'use_ash%': '<(use_ash)',
52 'use_cras%': '<(use_cras)', 52 'use_cras%': '<(use_cras)',
53 'use_ozone%': '<(use_ozone)', 53 'use_ozone%': '<(use_ozone)',
54 'embedded%': '<(embedded)', 54 'embedded%': '<(embedded)',
55 'host_arch%': '<(host_arch)', 55 'host_arch%': '<(host_arch)',
56 56
57 # Whether we are using Views Toolkit 57 # Whether we are using Views Toolkit
58 'toolkit_views%': 0, 58 'toolkit_views%': 0,
59 59
60 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803 60 # Use OpenSSL instead of NSS as the underlying SSL and crypto
61 # implementation. Certificate verification will in most cases be
62 # handled by the OS. If OpenSSL's struct X509 is used to represent
63 # certificates, use_openssl_certs must be set.
61 'use_openssl%': 0, 64 'use_openssl%': 0,
62 65
66 # Typedef X509Certificate::OSCertHandle to OpenSSL's struct X509*.
67 'use_openssl_certs%': 0,
68
63 # Disable viewport meta tag by default. 69 # Disable viewport meta tag by default.
64 'enable_viewport%': 0, 70 'enable_viewport%': 0,
65 71
66 # Enable HiDPI support. 72 # Enable HiDPI support.
67 'enable_hidpi%': 0, 73 'enable_hidpi%': 0,
68 74
69 # Override buildtype to select the desired build flavor. 75 # Override buildtype to select the desired build flavor.
70 # Dev - everyday build for development/testing 76 # Dev - everyday build for development/testing
71 # Official - release build (generally implies additional processing) 77 # Official - release build (generally implies additional processing)
72 # TODO(mmoss) Once 'buildtype' is fully supported (e.g. Windows gyp 78 # TODO(mmoss) Once 'buildtype' is fully supported (e.g. Windows gyp
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 }, 134 },
129 # Copy conditionally-set variables out one scope. 135 # Copy conditionally-set variables out one scope.
130 'chromeos%': '<(chromeos)', 136 'chromeos%': '<(chromeos)',
131 'desktop_linux%': '<(desktop_linux)', 137 'desktop_linux%': '<(desktop_linux)',
132 'use_aura%': '<(use_aura)', 138 'use_aura%': '<(use_aura)',
133 'use_ash%': '<(use_ash)', 139 'use_ash%': '<(use_ash)',
134 'use_cras%': '<(use_cras)', 140 'use_cras%': '<(use_cras)',
135 'use_ozone%': '<(use_ozone)', 141 'use_ozone%': '<(use_ozone)',
136 'embedded%': '<(embedded)', 142 'embedded%': '<(embedded)',
137 'use_openssl%': '<(use_openssl)', 143 'use_openssl%': '<(use_openssl)',
144 'use_openssl_certs%': '<(use_openssl_certs)',
138 'use_system_fontconfig%': '<(use_system_fontconfig)', 145 'use_system_fontconfig%': '<(use_system_fontconfig)',
139 'enable_viewport%': '<(enable_viewport)', 146 'enable_viewport%': '<(enable_viewport)',
140 'enable_hidpi%': '<(enable_hidpi)', 147 'enable_hidpi%': '<(enable_hidpi)',
141 'buildtype%': '<(buildtype)', 148 'buildtype%': '<(buildtype)',
142 'branding%': '<(branding)', 149 'branding%': '<(branding)',
143 'host_arch%': '<(host_arch)', 150 'host_arch%': '<(host_arch)',
144 'target_arch%': '<(target_arch)', 151 'target_arch%': '<(target_arch)',
145 152
146 'target_subarch%': '', 153 'target_subarch%': '',
147 154
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 256 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
250 'desktop_linux%': '<(desktop_linux)', 257 'desktop_linux%': '<(desktop_linux)',
251 'use_aura%': '<(use_aura)', 258 'use_aura%': '<(use_aura)',
252 'use_ash%': '<(use_ash)', 259 'use_ash%': '<(use_ash)',
253 'use_cras%': '<(use_cras)', 260 'use_cras%': '<(use_cras)',
254 'use_ozone%': '<(use_ozone)', 261 'use_ozone%': '<(use_ozone)',
255 'use_ozone_evdev%': '<(use_ozone_evdev)', 262 'use_ozone_evdev%': '<(use_ozone_evdev)',
256 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)', 263 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)',
257 'embedded%': '<(embedded)', 264 'embedded%': '<(embedded)',
258 'use_openssl%': '<(use_openssl)', 265 'use_openssl%': '<(use_openssl)',
266 'use_openssl_certs%': '<(use_openssl_certs)',
259 'use_system_fontconfig%': '<(use_system_fontconfig)', 267 'use_system_fontconfig%': '<(use_system_fontconfig)',
260 'enable_viewport%': '<(enable_viewport)', 268 'enable_viewport%': '<(enable_viewport)',
261 'enable_hidpi%': '<(enable_hidpi)', 269 'enable_hidpi%': '<(enable_hidpi)',
262 'android_webview_build%': '<(android_webview_build)', 270 'android_webview_build%': '<(android_webview_build)',
263 'use_goma%': '<(use_goma)', 271 'use_goma%': '<(use_goma)',
264 'gomadir%': '<(gomadir)', 272 'gomadir%': '<(gomadir)',
265 'enable_app_list%': '<(enable_app_list)', 273 'enable_app_list%': '<(enable_app_list)',
266 'use_default_render_theme%': '<(use_default_render_theme)', 274 'use_default_render_theme%': '<(use_default_render_theme)',
267 'buildtype%': '<(buildtype)', 275 'buildtype%': '<(buildtype)',
268 'branding%': '<(branding)', 276 'branding%': '<(branding)',
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 'os_bsd%': 0, 562 'os_bsd%': 0,
555 }], 563 }],
556 564
557 # NSS usage. 565 # NSS usage.
558 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and u se_openssl==0', { 566 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and u se_openssl==0', {
559 'use_nss%': 1, 567 'use_nss%': 1,
560 }, { 568 }, {
561 'use_nss%': 0, 569 'use_nss%': 0,
562 }], 570 }],
563 571
572 # When OpenSSL is used for SSL and crypto on Unix-like systems, use
573 # OpenSSL's certificate definition.
574 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and u se_openssl==1', {
575 'use_openssl_certs%': 1,
576 }, {
577 'use_openssl_certs%': 0,
578 }],
579
564 # libudev usage. This currently only affects the content layer. 580 # libudev usage. This currently only affects the content layer.
565 ['OS=="linux" and embedded==0', { 581 ['OS=="linux" and embedded==0', {
566 'use_udev%': 1, 582 'use_udev%': 1,
567 }, { 583 }, {
568 'use_udev%': 0, 584 'use_udev%': 0,
569 }], 585 }],
570 586
571 # Flags to use X11 on non-Mac POSIX platforms. 587 # Flags to use X11 on non-Mac POSIX platforms.
572 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or use_ozone==1', { 588 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or use_ozone==1', {
573 'use_x11%': 0, 589 'use_x11%': 0,
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
916 'target_arch%': '<(target_arch)', 932 'target_arch%': '<(target_arch)',
917 'target_subarch%': '<(target_subarch)', 933 'target_subarch%': '<(target_subarch)',
918 'host_arch%': '<(host_arch)', 934 'host_arch%': '<(host_arch)',
919 'toolkit_views%': '<(toolkit_views)', 935 'toolkit_views%': '<(toolkit_views)',
920 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', 936 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
921 'use_aura%': '<(use_aura)', 937 'use_aura%': '<(use_aura)',
922 'use_ash%': '<(use_ash)', 938 'use_ash%': '<(use_ash)',
923 'use_cras%': '<(use_cras)', 939 'use_cras%': '<(use_cras)',
924 'use_mojo%': '<(use_mojo)', 940 'use_mojo%': '<(use_mojo)',
925 'use_openssl%': '<(use_openssl)', 941 'use_openssl%': '<(use_openssl)',
942 'use_openssl_certs%': '<(use_openssl_certs)',
926 'use_nss%': '<(use_nss)', 943 'use_nss%': '<(use_nss)',
927 'use_udev%': '<(use_udev)', 944 'use_udev%': '<(use_udev)',
928 'os_bsd%': '<(os_bsd)', 945 'os_bsd%': '<(os_bsd)',
929 'os_posix%': '<(os_posix)', 946 'os_posix%': '<(os_posix)',
930 'use_dbus%': '<(use_dbus)', 947 'use_dbus%': '<(use_dbus)',
931 'use_glib%': '<(use_glib)', 948 'use_glib%': '<(use_glib)',
932 'use_pango%': '<(use_pango)', 949 'use_pango%': '<(use_pango)',
933 'use_cairo%': '<(use_cairo)', 950 'use_cairo%': '<(use_cairo)',
934 'use_ozone%': '<(use_ozone)', 951 'use_ozone%': '<(use_ozone)',
935 'use_ozone_evdev%': '<(use_ozone_evdev)', 952 'use_ozone_evdev%': '<(use_ozone_evdev)',
(...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after
1538 'android_readelf%' : '<!(/bin/echo -n <(android_toolchain)/*-readelf)', 1555 'android_readelf%' : '<!(/bin/echo -n <(android_toolchain)/*-readelf)',
1539 1556
1540 # Determines whether we should optimize JNI generation at the cost of 1557 # Determines whether we should optimize JNI generation at the cost of
1541 # breaking assumptions in the build system that when inputs have changed 1558 # breaking assumptions in the build system that when inputs have changed
1542 # the outputs should always change as well. This is meant purely for 1559 # the outputs should always change as well. This is meant purely for
1543 # developer builds, to avoid spurious re-linking of native files. 1560 # developer builds, to avoid spurious re-linking of native files.
1544 'optimize_jni_generation%': 0, 1561 'optimize_jni_generation%': 0,
1545 1562
1546 # Always uses openssl. 1563 # Always uses openssl.
1547 'use_openssl%': 1, 1564 'use_openssl%': 1,
1565 'use_openssl_certs%': 1,
1548 1566
1549 'proprietary_codecs%': '<(proprietary_codecs)', 1567 'proprietary_codecs%': '<(proprietary_codecs)',
1550 'safe_browsing%': 2, 1568 'safe_browsing%': 2,
1551 'input_speech%': 0, 1569 'input_speech%': 0,
1552 'enable_automation%': 0, 1570 'enable_automation%': 0,
1553 'java_bridge%': 1, 1571 'java_bridge%': 1,
1554 'build_ffmpegsumo%': 0, 1572 'build_ffmpegsumo%': 0,
1555 # TODO(dmikurube): Change the default of use_allocator to "none". 1573 # TODO(dmikurube): Change the default of use_allocator to "none".
1556 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 1574 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
1557 'linux_use_tcmalloc%': 0, 1575 'linux_use_tcmalloc%': 0,
(...skipping 1006 matching lines...) Expand 10 before | Expand all | Expand 10 after
2564 'defines': ['ENABLE_HANGOUT_SERVICES_EXTENSION=1'], 2582 'defines': ['ENABLE_HANGOUT_SERVICES_EXTENSION=1'],
2565 }], 2583 }],
2566 ['enable_ipc_fuzzer==1', { 2584 ['enable_ipc_fuzzer==1', {
2567 'defines': ['ENABLE_IPC_FUZZER=1'], 2585 'defines': ['ENABLE_IPC_FUZZER=1'],
2568 }], 2586 }],
2569 ['video_hole==1', { 2587 ['video_hole==1', {
2570 'defines': ['VIDEO_HOLE=1'], 2588 'defines': ['VIDEO_HOLE=1'],
2571 }], 2589 }],
2572 ], # conditions for 'target_defaults' 2590 ], # conditions for 'target_defaults'
2573 'target_conditions': [ 2591 'target_conditions': [
2574 ['<(use_openssl)==1 or >(nacl_untrusted_build)==1', { 2592 ['<(use_openssl)==1', {
2575 'defines': ['USE_OPENSSL=1'], 2593 'defines': ['USE_OPENSSL=1'],
2576 }], 2594 }],
2595 ['<(use_openssl_certs)==1', {
2596 'defines': ['USE_OPENSSL_CERTS=1'],
2597 }],
2598 ['>(nacl_untrusted_build)==1', {
2599 'defines': [
2600 'USE_OPENSSL=1',
2601 'USE_OPENSSL_CERTS=1',
2602 ],
2603 }],
2577 ['<(use_nss)==1 and >(nacl_untrusted_build)==0', { 2604 ['<(use_nss)==1 and >(nacl_untrusted_build)==0', {
2578 'defines': ['USE_NSS=1'], 2605 'defines': ['USE_NSS=1'],
2579 }], 2606 }],
2580 ['enable_wexit_time_destructors==1', { 2607 ['enable_wexit_time_destructors==1', {
2581 'conditions': [ 2608 'conditions': [
2582 [ 'clang==1', { 2609 [ 'clang==1', {
2583 'cflags': [ 2610 'cflags': [
2584 '-Wexit-time-destructors', 2611 '-Wexit-time-destructors',
2585 ], 2612 ],
2586 'xcode_settings': { 2613 'xcode_settings': {
(...skipping 2577 matching lines...) Expand 10 before | Expand all | Expand 10 after
5164 # settings in target dicts. SYMROOT is a special case, because many other 5191 # settings in target dicts. SYMROOT is a special case, because many other
5165 # Xcode variables depend on it, including variables such as 5192 # Xcode variables depend on it, including variables such as
5166 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5193 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5167 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5194 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5168 # files to appear (when present) in the UI as actual files and not red 5195 # files to appear (when present) in the UI as actual files and not red
5169 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5196 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5170 # and therefore SYMROOT, needs to be set at the project level. 5197 # and therefore SYMROOT, needs to be set at the project level.
5171 'SYMROOT': '<(DEPTH)/xcodebuild', 5198 'SYMROOT': '<(DEPTH)/xcodebuild',
5172 }, 5199 },
5173 } 5200 }
OLDNEW
« no previous file with comments | « no previous file | crypto/crypto.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698