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

Side by Side Diff: BUILD.gn

Issue 258193002: Add missing comma to GN build file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/openssl/
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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 openssl. 5 # Config for us and everybody else depending on openssl.
6 config("openssl_config") { 6 config("openssl_config") {
7 include_dirs = [] 7 include_dirs = []
8 if (cpu_arch == "x64") { 8 if (cpu_arch == "x64") {
9 # Ensure the 64-bit opensslconf.h header is used in preference to the one 9 # Ensure the 64-bit opensslconf.h header is used in preference to the one
10 # in openssl/include. 10 # in openssl/include.
11 include_dirs += [ "config/x64" ] 11 include_dirs += [ "config/x64" ]
12 } 12 }
13 13
14 include_dirs += [ "openssl/include" ] 14 include_dirs += [ "openssl/include" ]
15 } 15 }
16 16
17 # Config internal to this build file. 17 # Config internal to this build file.
18 config("openssl_internal_config") { 18 config("openssl_internal_config") {
19 visibility = ":*" # Only targets in this file can depend on this. 19 visibility = ":*" # Only targets in this file can depend on this.
20 } 20 }
21 21
22 # The list of OpenSSL files is kept in openssl.gypi. Read it. 22 # The list of OpenSSL files is kept in openssl.gypi. Read it.
23 gypi_values = exec_script( 23 gypi_values = exec_script(
24 "//build/gypi_to_gn.py", 24 "//build/gypi_to_gn.py",
25 [ rebase_path("//third_party/openssl/openssl.gypi") ] 25 [ rebase_path("//third_party/openssl/openssl.gypi") ],
26 "scope", 26 "scope",
27 [ "//third_party/openssl/openssl.gypi" ]) 27 [ "//third_party/openssl/openssl.gypi" ])
28 28
29 component("openssl") { 29 component("openssl") {
30 sources = gypi_values.openssl_common_sources 30 sources = gypi_values.openssl_common_sources
31 31
32 defines = gypi_values.openssl_common_defines 32 defines = gypi_values.openssl_common_defines
33 defines += [ 33 defines += [
34 "PURIFY", 34 "PURIFY",
35 "MONOLITH", 35 "MONOLITH",
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 # OpenSSL uses several function-style macros and then ignores the 84 # OpenSSL uses several function-style macros and then ignores the
85 # returned value. 85 # returned value.
86 "-Wno-unused-value", 86 "-Wno-unused-value",
87 ] 87 ]
88 } else { 88 } else {
89 cflags += [ 89 cflags += [
90 "-Wno-unused-variable", 90 "-Wno-unused-variable",
91 ] 91 ]
92 } 92 }
93 } 93 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698