diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2017-11-22 13:46:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-30 15:38:34 +0000 |
| commit | 3e1692bebdf2e4c69adb2a23718ad230a74992dd (patch) | |
| tree | d8e5d319a480a8d2af56e09590612368e3a826a0 | |
| parent | ebe11c8e867bb65ad7cb1424fe4c096935741089 (diff) | |
| download | qtscript-3e1692bebdf2e4c69adb2a23718ad230a74992dd.tar.gz | |
[android] Fix compile with unified headers
Latest Android NDKs are using unified headers which don't have asm/procinfo.h
anymore but they provide asm/hwcap.h.
Change-Id: Ibd599952d5b22e5e6955958bed33773032ad8a28
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | configure.json | 5 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp | 2 | ||||
| -rw-r--r-- | src/script/configure.json | 23 | ||||
| -rw-r--r-- | src/script/script.pro | 2 |
4 files changed, 31 insertions, 1 deletions
diff --git a/configure.json b/configure.json new file mode 100644 index 0000000..63ea575 --- /dev/null +++ b/configure.json @@ -0,0 +1,5 @@ +{ + "subconfigs": [ + "src/script" + ] +} diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp index f42e69d..0e64ea1 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp @@ -36,7 +36,7 @@ #include <fcntl.h> #include <unistd.h> #include <elf.h> -# if OS(ANDROID) && PLATFORM(QT) +# if OS(ANDROID) && PLATFORM(QT) && !defined(HAVE_asm_hwcap_h) # include <asm/procinfo.h> # else # include <asm/hwcap.h> diff --git a/src/script/configure.json b/src/script/configure.json new file mode 100644 index 0000000..d8b45c9 --- /dev/null +++ b/src/script/configure.json @@ -0,0 +1,23 @@ +{ + "module": "script", + "testDir": "../../config.tests", + + "tests": { + "asm_hwcap_h": { + "label": "asm/hwcap.h", + "condition": "config.android", + "type": "compile", + "test": { + "include": "asm/hwcap.h" + } + } + }, + + "features": { + "asm_hwcap_h": { + "label": "asm/hwcap.h", + "condition": "config.android && tests.asm_hwcap_h", + "output": [ "privateFeature" ] + } + } +} diff --git a/src/script/script.pro b/src/script/script.pro index cedc173..228f486 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -36,6 +36,8 @@ mac { } } +qtConfig(asm_hwcap_h): DEFINES += HAVE_asm_hwcap_h + # Suppress 'LEAK' messages (see QTBUG-18201) DEFINES += LOG_DISABLED=1 |