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

Side by Side Diff: third_party/boringssl/boringssl.gyp

Issue 404613002: Fix BoringSSL build and tests on OS X. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 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 | « net/socket/ssl_client_socket_openssl.cc ('k') | third_party/boringssl/boringssl_tests.gypi » ('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 { 5 {
6 'includes': [ 6 'includes': [
7 'boringssl_tests.gypi', 7 'boringssl_tests.gypi',
8 ], 8 ],
9 'targets': [ 9 'targets': [
10 { 10 {
11 'target_name': 'boringssl', 11 'target_name': 'boringssl',
12 'type': 'static_library', 12 'type': '<(component)',
13 'includes': [ 13 'includes': [
14 'boringssl.gypi', 14 'boringssl.gypi',
15 ], 15 ],
16 'sources': [ 16 'sources': [
17 '<@(boringssl_lib_sources)', 17 '<@(boringssl_lib_sources)',
18 ], 18 ],
19 'conditions': [ 19 'conditions': [
20 ['target_arch == "arm"', { 20 ['target_arch == "arm"', {
21 'sources': [ '<@(boringssl_linux_arm_sources)' ], 21 'sources': [ '<@(boringssl_linux_arm_sources)' ],
22 }], 22 }],
(...skipping 22 matching lines...) Expand all
45 'sources': [ '<@(boringssl_win_x86_64_sources)' ], 45 'sources': [ '<@(boringssl_win_x86_64_sources)' ],
46 }], 46 }],
47 ['OS != "mac" and OS != "linux" and OS != "win" and OS != "android"' , { 47 ['OS != "mac" and OS != "linux" and OS != "win" and OS != "android"' , {
48 'defines': [ 'OPENSSL_NO_ASM' ], 48 'defines': [ 'OPENSSL_NO_ASM' ],
49 }], 49 }],
50 ] 50 ]
51 }], 51 }],
52 ['target_arch != "arm" and target_arch != "ia32" and target_arch != "x64 "', { 52 ['target_arch != "arm" and target_arch != "ia32" and target_arch != "x64 "', {
53 'defines': [ 'OPENSSL_NO_ASM' ], 53 'defines': [ 'OPENSSL_NO_ASM' ],
54 }], 54 }],
55 ['component == "shared_library"', {
56 'xcode_settings': {
57 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # no -fvisibility=hidden
58 },
59 'cflags!': ['-fvisibility=hidden'],
60 }],
55 ], 61 ],
56 'include_dirs': [ 62 'include_dirs': [
57 'src/include', 63 'src/include',
58 # This is for arm_arch.h, which is needed by some asm files. Since the 64 # 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 65 # asm files are generated and kept in a different directory, they
60 # cannot use relative paths to find this file. 66 # cannot use relative paths to find this file.
61 'src/crypto', 67 'src/crypto',
62 ], 68 ],
63 'direct_dependent_settings': { 69 'direct_dependent_settings': {
64 'include_dirs': [ 70 'include_dirs': [
(...skipping 10 matching lines...) Expand all
75 'dependencies': [ 81 'dependencies': [
76 '<@(boringssl_test_targets)', 82 '<@(boringssl_test_targets)',
77 '../../base/base.gyp:base', 83 '../../base/base.gyp:base',
78 '../../base/base.gyp:run_all_unittests', 84 '../../base/base.gyp:run_all_unittests',
79 '../../base/base.gyp:test_support_base', 85 '../../base/base.gyp:test_support_base',
80 '../../testing/gtest.gyp:gtest', 86 '../../testing/gtest.gyp:gtest',
81 ], 87 ],
82 }, 88 },
83 ], 89 ],
84 } 90 }
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_openssl.cc ('k') | third_party/boringssl/boringssl_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698