OLD | NEW |
1 # Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file | 1 # Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file |
2 # for details. All rights reserved. Use of this source code is governed by a | 2 # for details. All rights reserved. Use of this source code is governed by a |
3 # BSD-style license that can be found in the LICENSE file. | 3 # BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 # This file is included to modify the configurations to build third-party | 5 # This file is included to modify the configurations to build third-party |
6 # code from BoringSSL. | 6 # code from BoringSSL. |
7 # This code is C code, not C++, and is not warning-free, so we need to remove | 7 # This code is C code, not C++, and is not warning-free, so we need to remove |
8 # C++-specific flags, and add flags to supress the warnings in the code. | 8 # C++-specific flags, and add flags to supress the warnings in the code. |
9 { | 9 { |
10 'variables': { | 10 'variables': { |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 ], | 80 ], |
81 }, | 81 }, |
82 # TODO(24321): Also disable temporarily on arm64. Reenable after the next | 82 # TODO(24321): Also disable temporarily on arm64. Reenable after the next |
83 # roll. | 83 # roll. |
84 'Dart_arm64_Base': { | 84 'Dart_arm64_Base': { |
85 'abstract': 1, | 85 'abstract': 1, |
86 'defines': [ | 86 'defines': [ |
87 'OPENSSL_NO_ASM', | 87 'OPENSSL_NO_ASM', |
88 ], | 88 ], |
89 }, | 89 }, |
| 90 # Android 64-bit dbc build is for arm64, disable temporarily as well. |
| 91 'Dart_Android_arm64_Base': { |
| 92 'abstract': 1, |
| 93 'defines': [ |
| 94 'OPENSSL_NO_ASM', |
| 95 ], |
| 96 }, |
90 # When being built for Android nss expects __linux__ to be defined. | 97 # When being built for Android nss expects __linux__ to be defined. |
91 'Dart_Android_Base': { | 98 'Dart_Android_Base': { |
92 'target_conditions': [ | 99 'target_conditions': [ |
93 ['_toolset=="host"', { | 100 ['_toolset=="host"', { |
94 'defines!': [ | 101 'defines!': [ |
95 'ANDROID', | 102 'ANDROID', |
96 ], | 103 ], |
97 # Define __linux__ on Android build for NSS. | 104 # Define __linux__ on Android build for NSS. |
98 'defines': [ | 105 'defines': [ |
99 '__linux__', | 106 '__linux__', |
(...skipping 11 matching lines...) Expand all Loading... |
111 # Define __linux__ on Android build for NSS. | 118 # Define __linux__ on Android build for NSS. |
112 'cflags!': [ | 119 'cflags!': [ |
113 '-U__linux__', | 120 '-U__linux__', |
114 ], | 121 ], |
115 }] | 122 }] |
116 ], | 123 ], |
117 }, | 124 }, |
118 }, | 125 }, |
119 }, | 126 }, |
120 } | 127 } |
OLD | NEW |