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

Side by Side Diff: third_party/boringssl/BUILD.gn

Issue 684093011: Disable size_t truncation warning (C4267) on BoringSSL Win64. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update_gypi_and_asm.py Created 6 years, 1 month 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 | third_party/boringssl/boringssl.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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 # Config for us and everybody else depending on BoringSSL. 5 # Config for us and everybody else depending on BoringSSL.
6 config("openssl_config") { 6 config("openssl_config") {
7 include_dirs = [] 7 include_dirs = []
8 include_dirs += [ "src/include" ] 8 include_dirs += [ "src/include" ]
9 if (is_component_build) { 9 if (is_component_build) {
10 defines = [ 10 defines = [
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
55 # Also gets the include dirs from :openssl_config 55 # Also gets the include dirs from :openssl_config
56 include_dirs = [ 56 include_dirs = [
57 "src/include", 57 "src/include",
58 # This is for arm_arch.h, which is needed by some asm files. Since the 58 # This is for arm_arch.h, which is needed by some asm files. Since the
59 # asm files are generated and kept in a different directory, they 59 # asm files are generated and kept in a different directory, they
60 # cannot use relative paths to find this file. 60 # cannot use relative paths to find this file.
61 "src/crypto", 61 "src/crypto",
62 ] 62 ]
63 63
64 if (is_win) {
65 # TODO(davidben): Fix size_t truncations in BoringSSL.
66 # https://crbug.com/429039
67 cflags += [ "/wd4267"]
68 }
69
64 if (cpu_arch == "x64") { 70 if (cpu_arch == "x64") {
65 if (is_mac) { 71 if (is_mac) {
66 sources += gypi_values.boringssl_mac_x86_64_sources 72 sources += gypi_values.boringssl_mac_x86_64_sources
67 } else if (is_linux || is_android) { 73 } else if (is_linux || is_android) {
68 sources += gypi_values.boringssl_linux_x86_64_sources 74 sources += gypi_values.boringssl_linux_x86_64_sources
69 } else if (is_win) { 75 } else if (is_win) {
70 sources += gypi_values.boringssl_win_x86_64_sources 76 sources += gypi_values.boringssl_win_x86_64_sources
71 } else { 77 } else {
72 defines += [ "OPENSSL_NO_ASM" ] 78 defines += [ "OPENSSL_NO_ASM" ]
73 } 79 }
74 } else if (cpu_arch == "x86") { 80 } else if (cpu_arch == "x86") {
75 if (is_mac) { 81 if (is_mac) {
76 sources += gypi_values.boringssl_mac_x86_sources 82 sources += gypi_values.boringssl_mac_x86_sources
77 } else if (is_linux || is_android) { 83 } else if (is_linux || is_android) {
78 sources += gypi_values.boringssl_linux_x86_sources 84 sources += gypi_values.boringssl_linux_x86_sources
79 } else if (is_win) { 85 } else if (is_win) {
80 deps += [ ":boringssl_asm" ] 86 deps += [ ":boringssl_asm" ]
81 } else { 87 } else {
82 defines += [ "OPENSSL_NO_ASM" ] 88 defines += [ "OPENSSL_NO_ASM" ]
83 } 89 }
84 } else if (cpu_arch == "arm") { 90 } else if (cpu_arch == "arm") {
85 sources += gypi_values.boringssl_linux_arm_sources 91 sources += gypi_values.boringssl_linux_arm_sources
86 } else { 92 } else {
87 defines += [ "OPENSSL_NO_ASM" ] 93 defines += [ "OPENSSL_NO_ASM" ]
88 } 94 }
89 } 95 }
OLDNEW
« no previous file with comments | « no previous file | third_party/boringssl/boringssl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698