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

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

Issue 929793006: Update existing uses of /wd4267 to use the GN config (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@x64
Patch Set: Created 5 years, 10 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 | « storage/common/BUILD.gn ('k') | third_party/cld/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 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 = [ "BORINGSSL_SHARED_LIBRARY" ] 10 defines = [ "BORINGSSL_SHARED_LIBRARY" ]
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 defines = [ 45 defines = [
46 "BORINGSSL_IMPLEMENTATION", 46 "BORINGSSL_IMPLEMENTATION",
47 "BORINGSSL_NO_STATIC_INITIALIZER", 47 "BORINGSSL_NO_STATIC_INITIALIZER",
48 ] 48 ]
49 deps = [] 49 deps = []
50 if (is_component_build) { 50 if (is_component_build) {
51 defines += [ "BORINGSSL_SHARED_LIBRARY" ] 51 defines += [ "BORINGSSL_SHARED_LIBRARY" ]
52 } 52 }
53 53
54 configs -= [ "//build/config/compiler:chromium_code" ] 54 configs -= [ "//build/config/compiler:chromium_code" ]
55 configs += [ "//build/config/compiler:no_chromium_code" ] 55 configs += [
56 "//build/config/compiler:no_chromium_code",
57 # TODO(davidben): Fix size_t truncations in BoringSSL.
58 # https://crbug.com/429039
59 "//build/config/compiler:no_size_t_to_int_warning",
60 ]
56 61
57 # Also gets the include dirs from :openssl_config 62 # Also gets the include dirs from :openssl_config
58 include_dirs = [ 63 include_dirs = [
59 "src/include", 64 "src/include",
60 65
61 # This is for arm_arch.h, which is needed by some asm files. Since the 66 # This is for arm_arch.h, which is needed by some asm files. Since the
62 # asm files are generated and kept in a different directory, they 67 # asm files are generated and kept in a different directory, they
63 # cannot use relative paths to find this file. 68 # cannot use relative paths to find this file.
64 "src/crypto", 69 "src/crypto",
65 ] 70 ]
66 71
67 if (is_win) {
68 # TODO(davidben): Fix size_t truncations in BoringSSL.
69 # https://crbug.com/429039
70 cflags += [ "/wd4267" ]
71 }
72
73 if (cpu_arch == "x64") { 72 if (cpu_arch == "x64") {
74 if (is_mac) { 73 if (is_mac) {
75 sources += gypi_values.boringssl_mac_x86_64_sources 74 sources += gypi_values.boringssl_mac_x86_64_sources
76 } else if (is_linux || is_android) { 75 } else if (is_linux || is_android) {
77 sources += gypi_values.boringssl_linux_x86_64_sources 76 sources += gypi_values.boringssl_linux_x86_64_sources
78 } else if (is_win) { 77 } else if (is_win) {
79 deps += [ ":boringssl_asm" ] 78 deps += [ ":boringssl_asm" ]
80 } else { 79 } else {
81 defines += [ "OPENSSL_NO_ASM" ] 80 defines += [ "OPENSSL_NO_ASM" ]
82 } 81 }
83 } else if (cpu_arch == "x86") { 82 } else if (cpu_arch == "x86") {
84 if (is_mac) { 83 if (is_mac) {
85 sources += gypi_values.boringssl_mac_x86_sources 84 sources += gypi_values.boringssl_mac_x86_sources
86 } else if (is_linux || is_android) { 85 } else if (is_linux || is_android) {
87 sources += gypi_values.boringssl_linux_x86_sources 86 sources += gypi_values.boringssl_linux_x86_sources
88 } else if (is_win) { 87 } else if (is_win) {
89 deps += [ ":boringssl_asm" ] 88 deps += [ ":boringssl_asm" ]
90 } else { 89 } else {
91 defines += [ "OPENSSL_NO_ASM" ] 90 defines += [ "OPENSSL_NO_ASM" ]
92 } 91 }
93 } else if (cpu_arch == "arm") { 92 } else if (cpu_arch == "arm") {
94 sources += gypi_values.boringssl_linux_arm_sources 93 sources += gypi_values.boringssl_linux_arm_sources
95 } else if (cpu_arch == "arm64") { 94 } else if (cpu_arch == "arm64") {
96 sources += gypi_values.boringssl_linux_aarch64_sources 95 sources += gypi_values.boringssl_linux_aarch64_sources
97 } else { 96 } else {
98 defines += [ "OPENSSL_NO_ASM" ] 97 defines += [ "OPENSSL_NO_ASM" ]
99 } 98 }
100 } 99 }
OLDNEW
« no previous file with comments | « storage/common/BUILD.gn ('k') | third_party/cld/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698