Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 23:02:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1428182 - 9. Apply Skia upstream commit to support NDK r16; r=lsalzman

Browse Source 
Apply Skia upstream commit 592c225b03ca677a1217eabdbc38eede6afcdb14 to
support building with NDK r16.

MozReview-Commit-ID: B6popOoPTni

--HG--
extra : rebase_source : 7d846431f9de12a2ffa270ead93c33cae602c58e
This commit is contained in:
Jim Chen 2018-01-30 14:08:23 -05:00
parent 8c9f5ba234
commit 5aa4623e3f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/skia/skia/src/core/SkCpu.cpp
View File

@ -85,8 +85,10 @@
return features;
}
#elif defined(SK_CPU_ARM32) && __has_include(<asm/hwcap.h>) && __has_include(<sys/auxv.h>)
// asm/hwcap.h and sys/auxv.h won't be present on NDK builds before API v21.
#elif defined(SK_CPU_ARM32) && __has_include(<sys/auxv.h>) && \
(!defined(__ANDROID_API__) || __ANDROID_API__ >= 18)
// sys/auxv.h will always be present in the Android NDK due to unified
//headers, but getauxval is only defined for API >= 18.
#include <asm/hwcap.h>
#include <sys/auxv.h>