From aa822554473f9e960ea22d35be922062fd2a6ed3 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Tue, 7 Jan 2020 19:23:04 +0100
Subject: [PATCH] Update android packaging to support Qt 5.14

---
 android_openssl                       | 2 +-
 packaging/android/AndroidManifest.xml | 6 +++---
 packaging/android/res/values/libs.xml | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/android_openssl b/android_openssl
index d97317e8..ebb0b68b 160000
--- a/android_openssl
+++ b/android_openssl
@@ -1 +1 @@
-Subproject commit d97317e856d55a2f5399f17888f1852fee8b9553
+Subproject commit ebb0b68be41f4559a4785db5951b7d8cfa042e6e
diff --git a/packaging/android/AndroidManifest.xml b/packaging/android/AndroidManifest.xml
index d182dde5..4bbbaaf7 100644
--- a/packaging/android/AndroidManifest.xml
+++ b/packaging/android/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <manifest package="io.guh.nymeaapp" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
 
-    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="nymea:app" android:icon="@mipmap/icon" android:roundIcon="@mipmap/round_icon">
-        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="io.guh.nymeaapp.NymeaAppActivity" android:label="nymea:app" android:screenOrientation="unspecified" android:launchMode="singleTop" android:theme="@style/SplashScreenTheme">
+    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="nymea:app" android:icon="@mipmap/icon" android:roundIcon="@mipmap/round_icon" android:extractNativeLibs="true">
+        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name="io.guh.nymeaapp.NymeaAppActivity" android:label="nymea:app" android:screenOrientation="unspecified" android:launchMode="singleTop" android:theme="@style/SplashScreenTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -24,7 +24,7 @@
             <!-- Run with local libs -->
             <meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
             <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
-            <meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/>
+            <meta-data android:name="android.app.load_local_libs_resource_id" android:resource="@array/load_local_libs"/>
             <meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
             <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
             <!--  Messages maps -->
diff --git a/packaging/android/res/values/libs.xml b/packaging/android/res/values/libs.xml
index 77f422cf..1437232f 100644
--- a/packaging/android/res/values/libs.xml
+++ b/packaging/android/res/values/libs.xml
@@ -22,4 +22,8 @@
         <!-- %%INSERT_BUNDLED_IN_ASSETS%% -->
     </array>
 
+    <array name="load_local_libs">
+        <!-- %%INSERT_LOCAL_LIBS%% -->
+    </array>
+
 </resources>