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

Side by Side Diff: openssl.gyp

Issue 144383010: A direct dependent of this project should also use the x64 version of (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/openssl/
Patch Set: Add '.' back to openssl_include_dirs Created 6 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 | 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 (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 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'openssl', 8 'target_name': 'openssl',
9 'type': '<(component)', 9 'type': '<(component)',
10 'includes': [ 10 'includes': [
11 # Include the auto-generated gypi file. 11 # Include the auto-generated gypi file.
12 'openssl.gypi' 12 'openssl.gypi'
13 ], 13 ],
14 'variables': { 14 'variables': {
15 'openssl_include_dirs': [ 15 'openssl_include_dirs': [
16 '.', 16 '.',
17 'openssl', 17 'openssl',
18 'openssl/crypto', 18 'openssl/crypto',
19 'openssl/crypto/asn1', 19 'openssl/crypto/asn1',
20 'openssl/crypto/evp', 20 'openssl/crypto/evp',
21 'openssl/crypto/modes', 21 'openssl/crypto/modes',
22 'openssl/include', 22 'openssl/include',
23 ], 23 ],
24 'openssl_public_include_dirs': [
25 'openssl/include',
26 ],
24 }, 27 },
25 'sources': [ 28 'sources': [
26 '<@(openssl_common_sources)', 29 '<@(openssl_common_sources)',
27 ], 30 ],
28 'defines': [ 31 'defines': [
29 '<@(openssl_common_defines)', 32 '<@(openssl_common_defines)',
30 'PURIFY', 33 'PURIFY',
31 'MONOLITH', 34 'MONOLITH',
32 'OPENSSL_NO_ASM', 35 'OPENSSL_NO_ASM',
33 ], 36 ],
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 ['include', 'openssl/crypto/rc4/rc4_enc\\.c' ], 79 ['include', 'openssl/crypto/rc4/rc4_enc\\.c' ],
77 ['include', 'openssl/crypto/rc4/rc4_skey\\.c' ], 80 ['include', 'openssl/crypto/rc4/rc4_skey\\.c' ],
78 ], 81 ],
79 }] 82 }]
80 ], 83 ],
81 'defines': [ '<@(openssl_x86_64_defines)' ], 84 'defines': [ '<@(openssl_x86_64_defines)' ],
82 'defines!': [ 'OPENSSL_NO_ASM' ], 85 'defines!': [ 'OPENSSL_NO_ASM' ],
83 'variables': { 86 'variables': {
84 # Ensure the 64-bit opensslconf.h header is used. 87 # Ensure the 64-bit opensslconf.h header is used.
85 'openssl_include_dirs+': [ 'config/x64' ], 88 'openssl_include_dirs+': [ 'config/x64' ],
89 'openssl_public_include_dirs+': [ 'config/x64' ],
Ryan Sleevi 2014/02/05 02:13:03 Is the public API affected by this (eg: including
wtc 2014/02/05 17:14:32 opensslconf.h is the only header under the config/
86 }, 90 },
87 }], 91 }],
88 ['component == "shared_library"', { 92 ['component == "shared_library"', {
89 'cflags!': ['-fvisibility=hidden'], 93 'cflags!': ['-fvisibility=hidden'],
90 }], 94 }],
91 ['clang==1', { 95 ['clang==1', {
92 'cflags': [ 96 'cflags': [
93 # OpenSSL has a few |if ((foo == NULL))| checks. 97 # OpenSSL has a few |if ((foo == NULL))| checks.
94 '-Wno-parentheses-equality', 98 '-Wno-parentheses-equality',
95 # OpenSSL uses several function-style macros and then ignores the 99 # OpenSSL uses several function-style macros and then ignores the
96 # returned value. 100 # returned value.
97 '-Wno-unused-value', 101 '-Wno-unused-value',
98 ], 102 ],
99 }, { # Not clang. Disable all warnings. 103 }, { # Not clang. Disable all warnings.
100 'cflags': [ 104 'cflags': [
101 '-w', 105 '-w',
102 ], 106 ],
103 }] 107 }]
104 ], 108 ],
105 'include_dirs': [ 109 'include_dirs': [
106 '<@(openssl_include_dirs)', 110 '<@(openssl_include_dirs)',
107 ], 111 ],
108 'direct_dependent_settings': { 112 'direct_dependent_settings': {
109 'include_dirs': [ 113 'include_dirs': [
110 'openssl/include', 114 '<@(openssl_public_include_dirs)',
111 ], 115 ],
112 }, 116 },
113 }, 117 },
114 ], 118 ],
115 } 119 }
116 120
117 # Local Variables: 121 # Local Variables:
118 # tab-width:2 122 # tab-width:2
119 # indent-tabs-mode:nil 123 # indent-tabs-mode:nil
120 # End: 124 # End:
121 # vim: set expandtab tabstop=2 shiftwidth=2: 125 # vim: set expandtab tabstop=2 shiftwidth=2:
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