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

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

Issue 862133002: Update from https://crrev.com/312398 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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
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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'boringssl', 8 'target_name': 'boringssl',
9 'type': '<(component)', 9 'type': '<(component)',
10 'includes': [ 10 'includes': [
(...skipping 11 matching lines...) Expand all
22 'msvs_disabled_warnings': [ 4267, ], 22 'msvs_disabled_warnings': [ 4267, ],
23 'conditions': [ 23 'conditions': [
24 ['component == "shared_library"', { 24 ['component == "shared_library"', {
25 'defines': [ 25 'defines': [
26 'BORINGSSL_SHARED_LIBRARY', 26 'BORINGSSL_SHARED_LIBRARY',
27 ], 27 ],
28 }], 28 }],
29 ['target_arch == "arm"', { 29 ['target_arch == "arm"', {
30 'sources': [ '<@(boringssl_linux_arm_sources)' ], 30 'sources': [ '<@(boringssl_linux_arm_sources)' ],
31 }], 31 }],
32 ['target_arch == "arm64"', {
33 'sources': [ '<@(boringssl_linux_aarch64_sources)' ],
34 }],
32 ['target_arch == "ia32"', { 35 ['target_arch == "ia32"', {
33 'conditions': [ 36 'conditions': [
34 ['OS == "mac"', { 37 ['OS == "mac"', {
35 'sources': [ '<@(boringssl_mac_x86_sources)' ], 38 'sources': [ '<@(boringssl_mac_x86_sources)' ],
36 }], 39 }],
37 ['OS == "linux" or OS == "android"', { 40 ['OS == "linux" or OS == "android"', {
38 'sources': [ '<@(boringssl_linux_x86_sources)' ], 41 'sources': [ '<@(boringssl_linux_x86_sources)' ],
39 }], 42 }],
40 ['OS == "win"', { 43 ['OS == "win"', {
41 'sources': [ '<@(boringssl_win_x86_sources)' ], 44 'sources': [ '<@(boringssl_win_x86_sources)' ],
(...skipping 28 matching lines...) Expand all
70 }, 73 },
71 'includes': [ 74 'includes': [
72 '../yasm/yasm_compile.gypi', 75 '../yasm/yasm_compile.gypi',
73 ], 76 ],
74 }], 77 }],
75 ['OS != "mac" and OS != "linux" and OS != "win" and OS != "android"' , { 78 ['OS != "mac" and OS != "linux" and OS != "win" and OS != "android"' , {
76 'defines': [ 'OPENSSL_NO_ASM' ], 79 'defines': [ 'OPENSSL_NO_ASM' ],
77 }], 80 }],
78 ] 81 ]
79 }], 82 }],
80 ['target_arch != "arm" and target_arch != "ia32" and target_arch != "x64 "', { 83 ['target_arch != "arm" and target_arch != "ia32" and target_arch != "x64 " and target_arch != "arm64"', {
81 'defines': [ 'OPENSSL_NO_ASM' ], 84 'defines': [ 'OPENSSL_NO_ASM' ],
82 }], 85 }],
83 ], 86 ],
84 'include_dirs': [ 87 'include_dirs': [
85 'src/include', 88 'src/include',
86 # This is for arm_arch.h, which is needed by some asm files. Since the 89 # This is for arm_arch.h, which is needed by some asm files. Since the
87 # asm files are generated and kept in a different directory, they 90 # asm files are generated and kept in a different directory, they
88 # cannot use relative paths to find this file. 91 # cannot use relative paths to find this file.
89 'src/crypto', 92 'src/crypto',
90 ], 93 ],
91 'direct_dependent_settings': { 94 'direct_dependent_settings': {
92 'include_dirs': [ 95 'include_dirs': [
93 'src/include', 96 'src/include',
94 ], 97 ],
95 'conditions': [ 98 'conditions': [
96 ['component == "shared_library"', { 99 ['component == "shared_library"', {
97 'defines': [ 100 'defines': [
98 'BORINGSSL_SHARED_LIBRARY', 101 'BORINGSSL_SHARED_LIBRARY',
99 ], 102 ],
100 }], 103 }],
101 ], 104 ],
102 }, 105 },
103 }, 106 },
104 ], 107 ],
105 } 108 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698