| 1 | diff -u -r ../pixman-0.32.6/pixman/pixman-arm.c ./pixman/pixman-arm.c |
| 2 | --- ../pixman-0.32.6/pixman/pixman-arm.c 2013-11-17 09:43:18.000000000 +0100 |
| 3 | +++ ./pixman/pixman-arm.c 2014-08-05 12:54:39.252322492 +0200 |
| 4 | @@ -96,30 +96,10 @@ |
| 5 | |
| 6 | #elif defined(__ANDROID__) || defined(ANDROID) /* Android */ |
| 7 | |
| 8 | -#include <cpu-features.h> |
| 9 | - |
| 10 | static arm_cpu_features_t |
| 11 | detect_cpu_features (void) |
| 12 | { |
| 13 | - arm_cpu_features_t features = 0; |
| 14 | - AndroidCpuFamily cpu_family; |
| 15 | - uint64_t cpu_features; |
| 16 | - |
| 17 | - cpu_family = android_getCpuFamily(); |
| 18 | - cpu_features = android_getCpuFeatures(); |
| 19 | - |
| 20 | - if (cpu_family == ANDROID_CPU_FAMILY_ARM) |
| 21 | - { |
| 22 | - if (cpu_features & ANDROID_CPU_ARM_FEATURE_ARMv7) |
| 23 | - features |= ARM_V7; |
| 24 | - |
| 25 | - if (cpu_features & ANDROID_CPU_ARM_FEATURE_VFPv3) |
| 26 | - features |= ARM_VFP; |
| 27 | - |
| 28 | - if (cpu_features & ANDROID_CPU_ARM_FEATURE_NEON) |
| 29 | - features |= ARM_NEON; |
| 30 | - } |
| 31 | - |
| 32 | + arm_cpu_features_t features = (ARM_V7 | ARM_VFP | ARM_NEON); |
| 33 | return features; |
| 34 | } |
| 35 | |