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

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

Issue 385983006: net: pickup "586" asm files for x86. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: .. 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 | « no previous file | third_party/boringssl/boringssl.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 {
(...skipping 10 matching lines...) Expand all
21 'sources': [ '<@(boringssl_linux_arm_sources)' ], 21 'sources': [ '<@(boringssl_linux_arm_sources)' ],
22 }], 22 }],
23 ['target_arch == "ia32"', { 23 ['target_arch == "ia32"', {
24 'conditions': [ 24 'conditions': [
25 ['OS == "mac"', { 25 ['OS == "mac"', {
26 'sources': [ '<@(boringssl_mac_x86_sources)' ], 26 'sources': [ '<@(boringssl_mac_x86_sources)' ],
27 }], 27 }],
28 ['OS == "linux" or OS == "android"', { 28 ['OS == "linux" or OS == "android"', {
29 'sources': [ '<@(boringssl_linux_x86_sources)' ], 29 'sources': [ '<@(boringssl_linux_x86_sources)' ],
30 }], 30 }],
31 ['OS != "mac" and OS != "linux"', { 31 ['OS != "mac" and OS != "linux" and OS != "android"', {
32 'defines': [ 'OPENSSL_NO_ASM' ], 32 'defines': [ 'OPENSSL_NO_ASM' ],
33 }], 33 }],
34 ] 34 ]
35 }], 35 }],
36 ['target_arch == "x64"', { 36 ['target_arch == "x64"', {
37 'conditions': [ 37 'conditions': [
38 ['OS == "mac"', { 38 ['OS == "mac"', {
39 'sources': [ '<@(boringssl_mac_x86_64_sources)' ], 39 'sources': [ '<@(boringssl_mac_x86_64_sources)' ],
40 }], 40 }],
41 ['OS == "linux" or OS == "android"', { 41 ['OS == "linux" or OS == "android"', {
42 'sources': [ '<@(boringssl_linux_x86_64_sources)' ], 42 'sources': [ '<@(boringssl_linux_x86_64_sources)' ],
43 }], 43 }],
44 ['OS == "win"', { 44 ['OS == "win"', {
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"', { 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 != "x86" 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 ], 55 ],
56 'include_dirs': [ 56 'include_dirs': [
57 'src/include', 57 'src/include',
58 # This is for arm_arch.h, which is needed by some asm files. Since the 58 # 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 59 # asm files are generated and kept in a different directory, they
60 # cannot use relative paths to find this file. 60 # cannot use relative paths to find this file.
61 'src/crypto', 61 'src/crypto',
62 ], 62 ],
(...skipping 12 matching lines...) Expand all
75 'dependencies': [ 75 'dependencies': [
76 '<@(boringssl_test_targets)', 76 '<@(boringssl_test_targets)',
77 '../../base/base.gyp:base', 77 '../../base/base.gyp:base',
78 '../../base/base.gyp:run_all_unittests', 78 '../../base/base.gyp:run_all_unittests',
79 '../../base/base.gyp:test_support_base', 79 '../../base/base.gyp:test_support_base',
80 '../../testing/gtest.gyp:gtest', 80 '../../testing/gtest.gyp:gtest',
81 ], 81 ],
82 }, 82 },
83 ], 83 ],
84 } 84 }
OLDNEW
« no previous file with comments | « no previous file | third_party/boringssl/boringssl.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698