OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. | 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 } | 94 } |
95 } | 95 } |
96 #endif | 96 #endif |
97 #endif | 97 #endif |
98 #endif | 98 #endif |
99 return flags & mask; | 99 return flags & mask; |
100 } | 100 } |
101 | 101 |
102 #elif defined(__linux__) | 102 #elif defined(__linux__) |
103 #if defined(__ANDROID__) | 103 #if defined(__ANDROID__) |
| 104 #if defined(CHROMIUM_BUILD) |
| 105 #include <machine/cpu-features.h> |
| 106 #else |
104 #include <cpu-features.h> | 107 #include <cpu-features.h> |
| 108 #endif |
105 | 109 |
106 int arm_cpu_caps(void) | 110 int arm_cpu_caps(void) |
107 { | 111 { |
108 int flags; | 112 int flags; |
109 int mask; | 113 int mask; |
110 uint64_t features; | 114 uint64_t features; |
111 if (!arm_cpu_env_flags(&flags)) | 115 if (!arm_cpu_env_flags(&flags)) |
112 { | 116 { |
113 return flags; | 117 return flags; |
114 } | 118 } |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
209 #if defined(HAVE_NEON) | 213 #if defined(HAVE_NEON) |
210 flags |= HAS_NEON; | 214 flags |= HAS_NEON; |
211 #endif | 215 #endif |
212 return flags & mask; | 216 return flags & mask; |
213 } | 217 } |
214 | 218 |
215 #else | 219 #else |
216 #error "--enable-runtime-cpu-detect selected, but no CPU detection method " \ | 220 #error "--enable-runtime-cpu-detect selected, but no CPU detection method " \ |
217 "available for your platform. Reconfigure without --enable-runtime-cpu-detect." | 221 "available for your platform. Reconfigure without --enable-runtime-cpu-detect." |
218 #endif | 222 #endif |
OLD | NEW |