From 3e1692bebdf2e4c69adb2a23718ad230a74992dd Mon Sep 17 00:00:00 2001
From: BogDan Vatra <bogdan@kdab.com>
Date: Wed, 22 Nov 2017 13:46:33 +0200
Subject: [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>
---
 configure.json                                     |  5 +++++
 .../JavaScriptCore/assembler/MacroAssemblerARM.cpp |  2 +-
 src/script/configure.json                          | 23 ++++++++++++++++++++++
 src/script/script.pro                              |  2 ++
 4 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 configure.json
 create mode 100644 src/script/configure.json

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
 
-- 
cgit v1.2.1