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

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

Issue 1126663002: Use Mac assembly for x86 iOS simulator targets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missed a bit Created 5 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
« no previous file with comments | « third_party/boringssl/BUILD.gn ('k') | 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 { 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 28 matching lines...) Expand all
39 'conditions': [ 39 'conditions': [
40 ['OS == "linux" or OS == "android"', { 40 ['OS == "linux" or OS == "android"', {
41 'sources': [ '<@(boringssl_linux_aarch64_sources)' ], 41 'sources': [ '<@(boringssl_linux_aarch64_sources)' ],
42 }, { 42 }, {
43 'defines': [ 'OPENSSL_NO_ASM' ], 43 'defines': [ 'OPENSSL_NO_ASM' ],
44 }], 44 }],
45 ], 45 ],
46 }], 46 }],
47 ['target_arch == "ia32"', { 47 ['target_arch == "ia32"', {
48 'conditions': [ 48 'conditions': [
49 ['OS == "mac"', { 49 ['OS == "mac" or OS == "ios"', {
50 'sources': [ '<@(boringssl_mac_x86_sources)' ], 50 'sources': [ '<@(boringssl_mac_x86_sources)' ],
51 }], 51 }],
52 ['OS == "linux" or OS == "android"', { 52 ['OS == "linux" or OS == "android"', {
53 'sources': [ '<@(boringssl_linux_x86_sources)' ], 53 'sources': [ '<@(boringssl_linux_x86_sources)' ],
54 }], 54 }],
55 ['OS == "win"', { 55 ['OS == "win"', {
56 'sources': [ '<@(boringssl_win_x86_sources)' ], 56 'sources': [ '<@(boringssl_win_x86_sources)' ],
57 # Windows' assembly is built with Yasm. The other platforms use 57 # Windows' assembly is built with Yasm. The other platforms use
58 # the platform assembler. 58 # the platform assembler.
59 'variables': { 59 'variables': {
60 'yasm_output_path': '<(SHARED_INTERMEDIATE_DIR)/third_party/bori ngssl', 60 'yasm_output_path': '<(SHARED_INTERMEDIATE_DIR)/third_party/bori ngssl',
61 }, 61 },
62 'includes': [ 62 'includes': [
63 '../yasm/yasm_compile.gypi', 63 '../yasm/yasm_compile.gypi',
64 ], 64 ],
65 }], 65 }],
66 ['OS != "mac" and OS != "linux" and OS != "win" and OS != "android"' , { 66 ['OS != "mac" and OS != "ios" and OS != "linux" and OS != "win" and OS != "android"', {
67 'defines': [ 'OPENSSL_NO_ASM' ], 67 'defines': [ 'OPENSSL_NO_ASM' ],
68 }], 68 }],
69 ] 69 ]
70 }], 70 }],
71 ['target_arch == "x64"', { 71 ['target_arch == "x64"', {
72 'conditions': [ 72 'conditions': [
73 ['OS == "mac"', { 73 ['OS == "mac" or OS == "ios"', {
74 'sources': [ '<@(boringssl_mac_x86_64_sources)' ], 74 'sources': [ '<@(boringssl_mac_x86_64_sources)' ],
75 }], 75 }],
76 ['OS == "linux" or OS == "android"', { 76 ['OS == "linux" or OS == "android"', {
77 'sources': [ '<@(boringssl_linux_x86_64_sources)' ], 77 'sources': [ '<@(boringssl_linux_x86_64_sources)' ],
78 }], 78 }],
79 ['OS == "win"', { 79 ['OS == "win"', {
80 'sources': [ '<@(boringssl_win_x86_64_sources)' ], 80 'sources': [ '<@(boringssl_win_x86_64_sources)' ],
81 # Windows' assembly is built with Yasm. The other platforms use 81 # Windows' assembly is built with Yasm. The other platforms use
82 # the platform assembler. 82 # the platform assembler.
83 'variables': { 83 'variables': {
84 'yasm_output_path': '<(SHARED_INTERMEDIATE_DIR)/third_party/bori ngssl', 84 'yasm_output_path': '<(SHARED_INTERMEDIATE_DIR)/third_party/bori ngssl',
85 }, 85 },
86 'includes': [ 86 'includes': [
87 '../yasm/yasm_compile.gypi', 87 '../yasm/yasm_compile.gypi',
88 ], 88 ],
89 }], 89 }],
90 ['OS != "mac" and OS != "linux" and OS != "win" and OS != "android"' , { 90 ['OS != "mac" and OS != "ios" and OS != "linux" and OS != "win" and OS != "android"', {
91 'defines': [ 'OPENSSL_NO_ASM' ], 91 'defines': [ 'OPENSSL_NO_ASM' ],
92 }], 92 }],
93 ] 93 ]
94 }], 94 }],
95 ['target_arch != "arm" and target_arch != "ia32" and target_arch != "x64 " and target_arch != "arm64"', { 95 ['target_arch != "arm" and target_arch != "ia32" and target_arch != "x64 " and target_arch != "arm64"', {
96 'defines': [ 'OPENSSL_NO_ASM' ], 96 'defines': [ 'OPENSSL_NO_ASM' ],
97 }], 97 }],
98 ], 98 ],
99 'include_dirs': [ 99 'include_dirs': [
100 'src/include', 100 'src/include',
(...skipping 10 matching lines...) Expand all
111 ['component == "shared_library"', { 111 ['component == "shared_library"', {
112 'defines': [ 112 'defines': [
113 'BORINGSSL_SHARED_LIBRARY', 113 'BORINGSSL_SHARED_LIBRARY',
114 ], 114 ],
115 }], 115 }],
116 ], 116 ],
117 }, 117 },
118 }, 118 },
119 ], 119 ],
120 } 120 }
OLDNEW
« no previous file with comments | « third_party/boringssl/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698