diff options
| author | Tomasz Figa <[email protected]> | 2017-07-18 16:20:52 +0900 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-07-19 13:28:23 +0100 |
| commit | 107b9c70d04c381d5517582d67925a29eac6eac4 (patch) | |
| tree | 4725ce82c62952a861b3c5988f9ba2b70bd2c1e9 /src/gallium/auxiliary/Android.mk | |
| parent | 644ac2b780366582fe1fee9a677b1f6a508e65dc (diff) | |
gallium: auxiliary: Fix standalone Android build of u_cpu_detect (v2)
Commit 463b7d0332c5("gallium: Enable ARM NEON CPU detection.")
introduced CPU feature detection based Android cpufeatures library.
Unfortunately it also added an assumption that if PIPE_OS_ANDROID is
defined, the library is also available, which is not true for the
standalone build without using Android build system.
Fix it by defining HAS_ANDROID_CPUFEATURES in Android.mk and replacing
respective #ifdefs to use it instead.
v2:
- Add a comment explaining why the separate flag is needed (Emil).
Signed-off-by: Tomasz Figa <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary/Android.mk')
| -rw-r--r-- | src/gallium/auxiliary/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk index 356390dfde6..26938384fb2 100644 --- a/src/gallium/auxiliary/Android.mk +++ b/src/gallium/auxiliary/Android.mk @@ -50,6 +50,7 @@ LOCAL_MODULE := libmesa_gallium LOCAL_STATIC_LIBRARIES += libmesa_nir LOCAL_WHOLE_STATIC_LIBRARIES += cpufeatures +LOCAL_CFLAGS += -DHAS_ANDROID_CPUFEATURES # generate sources LOCAL_MODULE_CLASS := STATIC_LIBRARIES |