Commit 49ab1bd9 authored by BogDan Vatra's avatar BogDan Vatra Committed by The Qt Project
Browse files

Android: fix compile


In early NDKs (previous to 9) Elf32_auxv_t struct was not defined at all.
In NDK 9+ Elf32_auxv_t struct is already defined in elf.h and we'll get an error.
We need to include asm/procinfo.h for HWCAP_VFP.

Change-Id: I1ba30991ea9dd14ad9d7273c58ed6e61cd75255e
Reviewed-by: default avatarSimon Hausmann <simon.hausmann@digia.com>
Showing with 1 addition and 8 deletions
...@@ -37,14 +37,7 @@ ...@@ -37,14 +37,7 @@
#include <unistd.h> #include <unistd.h>
#include <elf.h> #include <elf.h>
# if OS(ANDROID) && PLATFORM(QT) # if OS(ANDROID) && PLATFORM(QT)
typedef struct # include <asm/procinfo.h>
{
uint32_t a_type;
union
{
uint32_t a_val;
} a_un;
} Elf32_auxv_t;
# else # else
# include <asm/hwcap.h> # include <asm/hwcap.h>
# endif # endif
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment