diff --git a/.gitignore b/.gitignore
index dfb0f463..58727b83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,10 @@
 # Java class files
 *.class
 
+# Built libraries
+*.so
+*.jar
+
 # Generated files
 bin/
 gen/
@@ -64,7 +68,10 @@ captures/
 .externalNativeBuild
 
 # Google Services (e.g. APIs or Firebase)
-# google-services.json
+# Never commit this: OpenCPN-builder drops a placeholder here for ENV=dev, and a
+# real one would be bdbcat's Firebase credentials. Committing either would make
+# ENV=prod silently build against whatever happened to be checked in.
+google-services.json
 
 # Freeline
 freeline.py
diff --git a/afilechooser2/build.gradle b/afilechooser2/build.gradle
index e04b9260..7560d95e 100644
--- a/afilechooser2/build.gradle
+++ b/afilechooser2/build.gradle
@@ -1,7 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdk 34
+    // Kept in step with app/: one compileSdk across the project means the
+    // builder image needs one SDK platform, not three. Compile-time only —
+    // targetSdk below is what governs runtime behaviour, and for a library
+    // module even that is overridden by the consuming app.
+    compileSdk 35
 
 
     defaultConfig {
diff --git a/app/build.gradle b/app/build.gradle
index 323c7660..151d6bb3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,6 +4,12 @@ plugins {
     id 'com.google.gms.google-services'
 }
 
+// ABIs to package, comma-separated, supplied by OpenCPN-builder's Makefile as
+// -POCPN_ABIS. Defaults to both so a bare `./gradlew` still builds a fat APK.
+// This single list drives ndk.abiFilters *and* which per-arch copy tasks run,
+// so a single-arch build never references the arch it didn't build.
+def ocpnAbis = ((project.findProperty('OCPN_ABIS') ?: 'armeabi-v7a,arm64-v8a') as String)
+        .split(',').collect { it.trim() }.findAll { it }
 
 android {
     compileSdkVersion 35
@@ -12,11 +18,11 @@ android {
         applicationId "org.opencpn.opencpn"
         minSdkVersion 21
         targetSdkVersion 36
-        versionCode 128
-        versionName "5.14.0"
+        versionCode ((project.findProperty('OCPN_VERSION_CODE') ?: "128") as int)
+        versionName (project.findProperty('OCPN_VERSION_NAME') ?: "5.14.0")
         setProperty("archivesBaseName", applicationId + "-v" + versionCode + "(" + versionName + ")")
         archivesBaseName = "$applicationId-v$versionCode($versionName)"
-        ndk.abiFilters 'armeabi-v7a','arm64-v8a'
+        ndk.abiFilters.addAll(ocpnAbis)
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_8
             targetCompatibility JavaVersion.VERSION_1_8
@@ -30,9 +36,18 @@ android {
             //signingConfig signingConfigs.release
         }
         debug {
+            // Install alongside a stock OpenCPN instead of colliding with it.
+            // Android keys installed apps on applicationId, so the suffix gives
+            // the debug build its own package name — and its own data dir, so
+            // test routes/charts stay separate from the Play Store app. Two
+            // things that are hardcoded to the base package rather than derived
+            // from applicationId are fixed to match: the FileProvider authority
+            // (src/debug/res/values/strings.xml) and a self-lookup in
+            // QtActivity.java. See docs/android-build.md.
+            applicationIdSuffix ".debug"
+            versionNameSuffix "-debug"
             ndk {
-                abiFilters "armeabi-v7a"
-                abiFilters 'arm64-v8a'
+                abiFilters.addAll(ocpnAbis)
                 //abiFilters 'x86'
             }
         }
@@ -111,14 +126,26 @@ dependencies {
     implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-crashlytics-ndk'
 
-    def Qt_Base = "/home/dsr/Projects/opencpn/cache/OCPNAndroidCommon-master/qt5"
-    def Qt_Build = "build_arm32_19_O3"
-    def Qt_Build_ARM64 = "build_arm64_O3"
-    def Qt_Build_x86 = "build_x86"
-    def OCPN_Base = "/home/dsr/Projects/opencpn"
-    def OCPN_Build = "build_android_32_cci_22b"
-    def OCPN_Build_64 = "build_android_64_cci_22b"
-    def OCPN_Build_x86 = "build_android_x86_O3"
+    // Where the staged artifacts come from. Supplied with -P by OpenCPN-builder
+    // (see its Makefile); the defaults keep a bare `./gradlew` working from a
+    // conventional side-by-side checkout.
+    //
+    // These were hardcoded absolute paths into one developer's home directory,
+    // which also assumed the build directories lived *inside* the source tree.
+    // They are separate here, so source and build are separate properties.
+    def OCPN_Base = project.findProperty('OCPN_SRC') ?: "${rootDir}/../OpenCPN"
+    def OCPN_Build = project.findProperty('OCPN_BUILD_ARMHF') ?: "${rootDir}/../build-android-armhf"
+    def OCPN_Build_64 = project.findProperty('OCPN_BUILD_ARM64') ?: "${rootDir}/../build-android-arm64"
+    def Qt_ARMHF = project.findProperty('QT_ARMHF') ?: "/usr/src/qt5/armhf"
+    def Qt_ARM64 = project.findProperty('QT_ARM64') ?: "/usr/src/qt5/arm64"
+    // libc++_shared.so must come from the same NDK that built libgorp.so.
+    def NDK_Sysroot = project.findProperty('NDK_SYSROOT') ?: ""
+
+    // Arch-independent artifacts (the translation .mo files) are staged once,
+    // outside any per-arch tree, so the APK's languages don't depend on which
+    // arch was built. OpenCPN-builder fills this via -POCPN_BUILD_ALL; the
+    // default falls back to the armhf tree for a side-by-side ./gradlew.
+    def OCPN_Build_All = project.findProperty('OCPN_BUILD_ALL') ?: OCPN_Build
 
 
     //https://docs.gradle.org/current/userguide/working_with_files.html
@@ -174,14 +201,14 @@ dependencies {
     }
 
     task copyUIFiles(type: Copy){
-        from "${OCPN_Base}/src/bitmaps/styles.xml"
-        from "${OCPN_Base}/src/bitmaps/toolicons_traditional.png"
-        from "${OCPN_Base}/src/bitmaps/toolicons_journeyman.png"
-        from "${OCPN_Base}/src/bitmaps/toolicons_journeyman_flat.png"
+        from "${OCPN_Base}/resources/bitmaps/styles.xml"
+        from "${OCPN_Base}/resources/bitmaps/toolicons_traditional.png"
+        from "${OCPN_Base}/resources/bitmaps/toolicons_journeyman.png"
+        from "${OCPN_Base}/resources/bitmaps/toolicons_journeyman_flat.png"
         from "${OCPN_Base}/data/svg/traditional/settings.svg"
-        from "${OCPN_Base}/src/bitmaps/DragHandle.svg"
-        from "${OCPN_Base}/src/bitmaps/eye.svg"
-        from "${OCPN_Base}/src/bitmaps/eyex.svg"
+        from "${OCPN_Base}/resources/bitmaps/DragHandle.svg"
+        from "${OCPN_Base}/resources/bitmaps/eye.svg"
+        from "${OCPN_Base}/resources/bitmaps/eyex.svg"
 
         into 'src/main/assets/files/uidata'
     }
@@ -289,79 +316,72 @@ dependencies {
     }
 
     task copyLocalefrFiles(type: Copy) {
-        from "${OCPN_Base}/${OCPN_Build}/Resources/opencpn_fr.lproj/opencpn.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/chartdldr_pi/Resources/fr_FR.lproj/opencpn-chartdldr_pi.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/wmm_pi/Resources/fr_FR.lproj/opencpn-wmm_pi.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/grib_pi/Resources/fr_FR.lproj/opencpn-grib_pi.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/dashboard_pi/Resources/fr_FR.lproj/opencpn-dashboard_pi.mo"
+        from "${OCPN_Build_All}/Resources/opencpn_fr.lproj/opencpn.mo"
+        from "${OCPN_Build_All}/plugins/chartdldr_pi/Resources/fr_FR.lproj/opencpn-chartdldr_pi.mo"
+        from "${OCPN_Build_All}/plugins/wmm_pi/Resources/fr_FR.lproj/opencpn-wmm_pi.mo"
+        from "${OCPN_Build_All}/plugins/grib_pi/Resources/fr_FR.lproj/opencpn-grib_pi.mo"
+        from "${OCPN_Build_All}/plugins/dashboard_pi/Resources/fr_FR.lproj/opencpn-dashboard_pi.mo"
 
-        from "${OCPN_Base}/Resources/locale/fr/LC_MESSAGES/wxstd.mo"
         into 'src/main/assets/files/locale/fr/LC_MESSAGES'
     }
 
     task copyLocaleesFiles(type: Copy) {
-        from "${OCPN_Base}/${OCPN_Build}/Resources/opencpn_es.lproj/opencpn.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/chartdldr_pi/Resources/es_ES.lproj/opencpn-chartdldr_pi.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/wmm_pi/Resources/es_ES.lproj/opencpn-wmm_pi.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/grib_pi/Resources/es_ES.lproj/opencpn-grib_pi.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/dashboard_pi/Resources/es_ES.lproj/opencpn-dashboard_pi.mo"
+        from "${OCPN_Build_All}/Resources/opencpn_es.lproj/opencpn.mo"
+        from "${OCPN_Build_All}/plugins/chartdldr_pi/Resources/es_ES.lproj/opencpn-chartdldr_pi.mo"
+        from "${OCPN_Build_All}/plugins/wmm_pi/Resources/es_ES.lproj/opencpn-wmm_pi.mo"
+        from "${OCPN_Build_All}/plugins/grib_pi/Resources/es_ES.lproj/opencpn-grib_pi.mo"
+        from "${OCPN_Build_All}/plugins/dashboard_pi/Resources/es_ES.lproj/opencpn-dashboard_pi.mo"
 
-        from "${OCPN_Base}/Resources/locale/es/LC_MESSAGES/wxstd.mo"
         into 'src/main/assets/files/locale/es/LC_MESSAGES'
     }
 
     task copyLocaledeFiles(type: Copy) {
-        from "${OCPN_Base}/${OCPN_Build}/Resources/opencpn_de.lproj/opencpn.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/chartdldr_pi/Resources/de_DE.lproj/opencpn-chartdldr_pi.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/wmm_pi/Resources/de_DE.lproj/opencpn-wmm_pi.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/grib_pi/Resources/de_DE.lproj/opencpn-grib_pi.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/dashboard_pi/Resources/de_DE.lproj/opencpn-dashboard_pi.mo"
-        from "${OCPN_Base}/Resources/locale/de/LC_MESSAGES/wxstd.mo"
+        from "${OCPN_Build_All}/Resources/opencpn_de.lproj/opencpn.mo"
+        from "${OCPN_Build_All}/plugins/chartdldr_pi/Resources/de_DE.lproj/opencpn-chartdldr_pi.mo"
+        from "${OCPN_Build_All}/plugins/wmm_pi/Resources/de_DE.lproj/opencpn-wmm_pi.mo"
+        from "${OCPN_Build_All}/plugins/grib_pi/Resources/de_DE.lproj/opencpn-grib_pi.mo"
+        from "${OCPN_Build_All}/plugins/dashboard_pi/Resources/de_DE.lproj/opencpn-dashboard_pi.mo"
         into 'src/main/assets/files/locale/de/LC_MESSAGES'
     }
 
     task copyLocalesvFiles(type: Copy) {
-        from "${OCPN_Base}/${OCPN_Build}/Resources/opencpn_sv.lproj/opencpn.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/chartdldr_pi/Resources/sv_SE.lproj/opencpn-chartdldr_pi.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/wmm_pi/Resources/sv_SE.lproj/opencpn-wmm_pi.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/grib_pi/Resources/sv_SE.lproj/opencpn-grib_pi.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/dashboard_pi/Resources/sv_SE.lproj/opencpn-dashboard_pi.mo"
-        from "${OCPN_Base}/Resources/locale/sv/LC_MESSAGES/wxstd.mo"
+        from "${OCPN_Build_All}/Resources/opencpn_sv.lproj/opencpn.mo"
+        from "${OCPN_Build_All}/plugins/chartdldr_pi/Resources/sv_SE.lproj/opencpn-chartdldr_pi.mo"
+        from "${OCPN_Build_All}/plugins/wmm_pi/Resources/sv_SE.lproj/opencpn-wmm_pi.mo"
+        from "${OCPN_Build_All}/plugins/grib_pi/Resources/sv_SE.lproj/opencpn-grib_pi.mo"
+        from "${OCPN_Build_All}/plugins/dashboard_pi/Resources/sv_SE.lproj/opencpn-dashboard_pi.mo"
         into 'src/main/assets/files/locale/sv/LC_MESSAGES'
     }
 
     task copyLocalenbNOFiles(type: Copy) {
-        from "${OCPN_Base}/${OCPN_Build}/Resources/opencpn_nb_NO.lproj/opencpn.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/chartdldr_pi/Resources/nb_NO.lproj/opencpn-chartdldr_pi.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/wmm_pi/Resources/nb_NO.lproj/opencpn-wmm_pi.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/grib_pi/Resources/nb_NO.lproj/opencpn-grib_pi.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/dashboard_pi/Resources/nb_NO.lproj/opencpn-dashboard_pi.mo"
-        from "${OCPN_Base}/Resources/locale/nb_NO/LC_MESSAGES/wxstd.mo"
+        from "${OCPN_Build_All}/Resources/opencpn_nb_NO.lproj/opencpn.mo"
+        from "${OCPN_Build_All}/plugins/chartdldr_pi/Resources/nb_NO.lproj/opencpn-chartdldr_pi.mo"
+        from "${OCPN_Build_All}/plugins/wmm_pi/Resources/nb_NO.lproj/opencpn-wmm_pi.mo"
+        from "${OCPN_Build_All}/plugins/grib_pi/Resources/nb_NO.lproj/opencpn-grib_pi.mo"
+        from "${OCPN_Build_All}/plugins/dashboard_pi/Resources/nb_NO.lproj/opencpn-dashboard_pi.mo"
         into 'src/main/assets/files/locale/nb_NO/LC_MESSAGES'
     }
 
     task copyLocalefiFIFiles(type: Copy) {
-        from "${OCPN_Base}/${OCPN_Build}/Resources/opencpn_fi_FI.lproj/opencpn.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/chartdldr_pi/Resources/fi_FI.lproj/opencpn-chartdldr_pi.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/wmm_pi/Resources/fi_FI.lproj/opencpn-wmm_pi.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/grib_pi/Resources/fi_FI.lproj/opencpn-grib_pi.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/dashboard_pi/Resources/fi_FI.lproj/opencpn-dashboard_pi.mo"
-        from "${OCPN_Base}/Resources/locale/fi_FI/LC_MESSAGES/wxstd.mo"
+        from "${OCPN_Build_All}/Resources/opencpn_fi_FI.lproj/opencpn.mo"
+        from "${OCPN_Build_All}/plugins/chartdldr_pi/Resources/fi_FI.lproj/opencpn-chartdldr_pi.mo"
+        from "${OCPN_Build_All}/plugins/wmm_pi/Resources/fi_FI.lproj/opencpn-wmm_pi.mo"
+        from "${OCPN_Build_All}/plugins/grib_pi/Resources/fi_FI.lproj/opencpn-grib_pi.mo"
+        from "${OCPN_Build_All}/plugins/dashboard_pi/Resources/fi_FI.lproj/opencpn-dashboard_pi.mo"
         into 'src/main/assets/files/locale/fi_FI/LC_MESSAGES'
     }
 
     task copyLocaleitFiles(type: Copy) {
-        from "${OCPN_Base}/${OCPN_Build}/Resources/opencpn_it.lproj/opencpn.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/chartdldr_pi/Resources/it_IT.lproj/opencpn-chartdldr_pi.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/wmm_pi/Resources/it_IT.lproj/opencpn-wmm_pi.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/grib_pi/Resources/it_IT.lproj/opencpn-grib_pi.mo"
-        from "${OCPN_Base}/${OCPN_Build}/plugins/dashboard_pi/Resources/it_IT.lproj/opencpn-dashboard_pi.mo"
-        from "${OCPN_Base}/Resources/locale/it/LC_MESSAGES/wxstd.mo"
+        from "${OCPN_Build_All}/Resources/opencpn_it.lproj/opencpn.mo"
+        from "${OCPN_Build_All}/plugins/chartdldr_pi/Resources/it_IT.lproj/opencpn-chartdldr_pi.mo"
+        from "${OCPN_Build_All}/plugins/wmm_pi/Resources/it_IT.lproj/opencpn-wmm_pi.mo"
+        from "${OCPN_Build_All}/plugins/grib_pi/Resources/it_IT.lproj/opencpn-grib_pi.mo"
+        from "${OCPN_Build_All}/plugins/dashboard_pi/Resources/it_IT.lproj/opencpn-dashboard_pi.mo"
         into 'src/main/assets/files/locale/it/LC_MESSAGES'
     }
 
     task copyWMM_PIFiles(type: Copy) {
-        from "${OCPN_Base}/${OCPN_Build}/plugins/wmm_pi/libwmm_pi.so"
+        from "${OCPN_Build}/plugins/wmm_pi/libwmm_pi.so"
         into 'src/main/assets/files/plugins'
         rename ('libwmm_pi.so', 'libwmm_pi.so32')
     }
@@ -372,7 +392,7 @@ dependencies {
     }
 
     task copyDNLDR_PIFiles(type: Copy) {
-        from "${OCPN_Base}/${OCPN_Build}/plugins/chartdldr_pi/libchartdldr_pi.so"
+        from "${OCPN_Build}/plugins/chartdldr_pi/libchartdldr_pi.so"
         into 'src/main/assets/files/plugins'
         rename ('libchartdldr_pi.so', 'libchartdldr_pi.so32')
     }
@@ -384,7 +404,7 @@ dependencies {
 
 
     task copyGRIB_PIFiles(type: Copy) {
-        from "${OCPN_Base}/${OCPN_Build}/plugins/grib_pi/libgrib_pi.so"
+        from "${OCPN_Build}/plugins/grib_pi/libgrib_pi.so"
         into 'src/main/assets/files/plugins'
         rename ('libgrib_pi.so', 'libgrib_pi.so32')
     }
@@ -395,7 +415,7 @@ dependencies {
     }
 
     task copyDASHBOARD_PIFiles(type: Copy) {
-        from "${OCPN_Base}/${OCPN_Build}/plugins/dashboard_pi/libdashboard_pi.so"
+        from "${OCPN_Build}/plugins/dashboard_pi/libdashboard_pi.so"
         into 'src/main/assets/files/plugins'
         rename ('libdashboard_pi.so', 'libdashboard_pi.so32')
     }
@@ -407,206 +427,133 @@ dependencies {
 
     // 64 Bit plugins
     task copyWMM_PIFiles64(type: Copy) {
-        from "${OCPN_Base}/${OCPN_Build_64}/plugins/wmm_pi/libwmm_pi.so"
+        from "${OCPN_Build_64}/plugins/wmm_pi/libwmm_pi.so"
         into 'src/main/assets/files/plugins'
         rename ('libwmm_pi.so', 'libwmm_pi.so64')
     }
 
     task copyDNLDR_PIFiles64(type: Copy) {
-        from "${OCPN_Base}/${OCPN_Build_64}/plugins/chartdldr_pi/libchartdldr_pi.so"
+        from "${OCPN_Build_64}/plugins/chartdldr_pi/libchartdldr_pi.so"
         into 'src/main/assets/files/plugins'
         rename ('libchartdldr_pi.so', 'libchartdldr_pi.so64')
     }
 
     task copyGRIB_PIFiles64(type: Copy) {
-        from "${OCPN_Base}/${OCPN_Build_64}/plugins/grib_pi/libgrib_pi.so"
+        from "${OCPN_Build_64}/plugins/grib_pi/libgrib_pi.so"
         into 'src/main/assets/files/plugins'
         rename ('libgrib_pi.so', 'libgrib_pi.so64')
     }
 
     task copyDASHBOARD_PIFiles64(type: Copy) {
-        from "${OCPN_Base}/${OCPN_Build_64}/plugins/dashboard_pi/libdashboard_pi.so"
+        from "${OCPN_Build_64}/plugins/dashboard_pi/libdashboard_pi.so"
         into 'src/main/assets/files/plugins'
         rename ('libdashboard_pi.so', 'libdashboard_pi.so64')
     }
 
     task copyQTJars(type: Copy) {
-        from "${Qt_Base}/${Qt_Build}/qtbase/jar/QtAndroid.jar"
-        from "${Qt_Base}/${Qt_Build}/qtbase/jar/QtAndroidExtras.jar"
+        from "${Qt_ARMHF}/jar/QtAndroid.jar"
+        from "${Qt_ARMHF}/jar/QtAndroidExtras.jar"
         into 'libs'
     }
 
+    // Qt 5.14+ ships one multi-ABI Android build, so every staged Qt library and
+    // plugin carries an ABI suffix (libQt5Core_armeabi-v7a.so) and keeps that
+    // suffix in its SONAME. The unsuffixed compat symlinks the builder stages
+    // alongside them (install-qt-android.sh) are for build-time linking only:
+    // what the APK bundles must be the real suffixed files, because libgorp.so's
+    // NEEDED entries and Qt's own inter-library references use the suffixed
+    // SONAMEs. So copy the suffixed files verbatim (no rename to the old
+    // libplugins_platforms_android_* names).
+    //
+    // NOTE: the platform/style plugin *load* wiring (which names QtLoader looks
+    // for) is set by Qt's Java side — the checked-in org.qtproject.qt5.android
+    // bindings + QtAndroid*.jar — which must be updated to 5.15.2 in lockstep
+    // (see TODO.md). These names match a 5.15.2 bundle; verify on first launch.
     task copyQTPlugins_armeabi_v7a(type: Copy) {
-        from "${Qt_Base}/${Qt_Build}/qtbase/plugins/platforms/android/libqtforandroid.so"
-        from "${Qt_Base}/${Qt_Build}/qtbase/plugins/styles/libqandroidstyle.so"
+        from "${Qt_ARMHF}/plugins/platforms/libplugins_platforms_qtforandroid_armeabi-v7a.so"
+        from "${Qt_ARMHF}/plugins/styles/libplugins_styles_qandroidstyle_armeabi-v7a.so"
         into 'src/main/assets/files/Qtplugins/armeabi-v7a'
-
-        rename ('libqtforandroid.so', 'libplugins_platforms_android_libqtforandroid.so')
-        rename ('libqandroidstyle.so', 'libplugins_styles_libqandroidstyle.so')
     }
 
     task copyQTPlugins_arm64_v8a(type: Copy) {
-        from "${Qt_Base}/${Qt_Build_ARM64}/qtbase/plugins/platforms/android/libqtforandroid.so"
-        from "${Qt_Base}/${Qt_Build_ARM64}/qtbase/plugins/styles/libqandroidstyle.so"
+        from "${Qt_ARM64}/plugins/platforms/libplugins_platforms_qtforandroid_arm64-v8a.so"
+        from "${Qt_ARM64}/plugins/styles/libplugins_styles_qandroidstyle_arm64-v8a.so"
         into 'src/main/assets/files/Qtplugins/arm64-v8a'
-
-        rename ('libqtforandroid.so', 'libplugins_platforms_android_libqtforandroid.so')
-        rename ('libqandroidstyle.so', 'libplugins_styles_libqandroidstyle.so')
     }
 
     task copyQTLibs_armeabi_v7a(type: Copy) {
-        from "${Qt_Base}/${Qt_Build}/qtbase/lib/libQt5Core.so"
-        from "${Qt_Base}/${Qt_Build}/qtbase/lib/libQt5Gui.so"
-        from "${Qt_Base}/${Qt_Build}/qtbase/lib/libQt5OpenGL.so"
-        from "${Qt_Base}/${Qt_Build}/qtbase/lib/libQt5Test.so"
-        from "${Qt_Base}/${Qt_Build}/qtbase/lib/libQt5Widgets.so"
-        from "${Qt_Base}/${Qt_Build}/qtbase/lib/libQt5AndroidExtras.so"
-        from "${Qt_Base}/${Qt_Build}/qtbase/plugins/platforms/android/libqtforandroid.so"
-        from "${Qt_Base}/${Qt_Build}/qtbase/plugins/styles/libqandroidstyle.so"
+        from "${Qt_ARMHF}/lib/libQt5Core_armeabi-v7a.so"
+        from "${Qt_ARMHF}/lib/libQt5Gui_armeabi-v7a.so"
+        from "${Qt_ARMHF}/lib/libQt5OpenGL_armeabi-v7a.so"
+        from "${Qt_ARMHF}/lib/libQt5Test_armeabi-v7a.so"
+        from "${Qt_ARMHF}/lib/libQt5Widgets_armeabi-v7a.so"
+        from "${Qt_ARMHF}/lib/libQt5AndroidExtras_armeabi-v7a.so"
+        from "${Qt_ARMHF}/plugins/platforms/libplugins_platforms_qtforandroid_armeabi-v7a.so"
+        from "${Qt_ARMHF}/plugins/styles/libplugins_styles_qandroidstyle_armeabi-v7a.so"
 
         into 'src/main/jniLibs/armeabi-v7a'
-
-        rename ('libqtforandroid.so', 'libplugins_platforms_android_libqtforandroid.so')
-        rename ('libqandroidstyle.so', 'libplugins_styles_libqandroidstyle.so')
     }
 
     task copyQTLibs_arm64_v8a(type: Copy) {
-        from "${Qt_Base}/${Qt_Build_ARM64}/qtbase/lib/libQt5Core.so"
-        from "${Qt_Base}/${Qt_Build_ARM64}/qtbase/lib/libQt5Gui.so"
-        from "${Qt_Base}/${Qt_Build_ARM64}/qtbase/lib/libQt5OpenGL.so"
-        from "${Qt_Base}/${Qt_Build_ARM64}/qtbase/lib/libQt5Test.so"
-        from "${Qt_Base}/${Qt_Build_ARM64}/qtbase/lib/libQt5Widgets.so"
-        from "${Qt_Base}/${Qt_Build_ARM64}/qtbase/lib/libQt5AndroidExtras.so"
-        from "${Qt_Base}/${Qt_Build_ARM64}/qtbase/plugins/platforms/android/libqtforandroid.so"
-        from "${Qt_Base}/${Qt_Build_ARM64}/qtbase/plugins/styles/libqandroidstyle.so"
+        from "${Qt_ARM64}/lib/libQt5Core_arm64-v8a.so"
+        from "${Qt_ARM64}/lib/libQt5Gui_arm64-v8a.so"
+        from "${Qt_ARM64}/lib/libQt5OpenGL_arm64-v8a.so"
+        from "${Qt_ARM64}/lib/libQt5Test_arm64-v8a.so"
+        from "${Qt_ARM64}/lib/libQt5Widgets_arm64-v8a.so"
+        from "${Qt_ARM64}/lib/libQt5AndroidExtras_arm64-v8a.so"
+        from "${Qt_ARM64}/plugins/platforms/libplugins_platforms_qtforandroid_arm64-v8a.so"
+        from "${Qt_ARM64}/plugins/styles/libplugins_styles_qandroidstyle_arm64-v8a.so"
 
         into 'src/main/jniLibs/arm64-v8a'
-
-        rename ('libqtforandroid.so', 'libplugins_platforms_android_libqtforandroid.so')
-        rename ('libqandroidstyle.so', 'libplugins_styles_libqandroidstyle.so')
     }
 
-    task copyQTLibs_x86(type: Copy) {
-        from "${Qt_Base}/${Qt_Build_x86}/qtbase/lib/libQt5Core.so"
-        from "${Qt_Base}/${Qt_Build_x86}/qtbase/lib/libQt5Gui.so"
-        from "${Qt_Base}/${Qt_Build_x86}/qtbase/lib/libQt5OpenGL.so"
-        from "${Qt_Base}/${Qt_Build_x86}/qtbase/lib/libQt5Test.so"
-        from "${Qt_Base}/${Qt_Build_x86}/qtbase/lib/libQt5Widgets.so"
-        from "${Qt_Base}/${Qt_Build_x86}/qtbase/lib/libQt5AndroidExtras.so"
-        from "${Qt_Base}/${Qt_Build_x86}/qtbase/plugins/platforms/android/libqtforandroid.so"
-        from "${Qt_Base}/${Qt_Build_x86}/qtbase/plugins/styles/libqandroidstyle.so"
 
-        into 'src/main/jniLibs/x86'
+    // libgorp.so links libc++_shared.so (DT_NEEDED) and Qt's loader lists
+    // c++_shared first in libs.xml, so it must be in jniLibs. Take it from the
+    // NDK that built the lib rather than the stale copy committed here.
+    task copyCxxShared_armeabi_v7a(type: Copy) {
+        from "${NDK_Sysroot}/usr/lib/arm-linux-androideabi/libc++_shared.so"
+        into 'src/main/jniLibs/armeabi-v7a'
+    }
 
-        rename ('libqtforandroid.so', 'libplugins_platforms_android_libqtforandroid.so')
-        rename ('libqandroidstyle.so', 'libplugins_styles_libqandroidstyle.so')
+    task copyCxxShared_arm64_v8a(type: Copy) {
+        from "${NDK_Sysroot}/usr/lib/aarch64-linux-android/libc++_shared.so"
+        into 'src/main/jniLibs/arm64-v8a'
     }
 
+    // The Qt 5.14+ loader (QtLoader, via android.app.lib_name=gorp) loads the
+    // main library as libgorp_<abi>.so — it appends "_" + preferredAbi. So the
+    // core lib, produced by the build as libgorp.so, must land in jniLibs under
+    // the ABI-suffixed name. (Its own SONAME is irrelevant: nothing links it; the
+    // loader dlopens it by this path, and its Qt NEEDED entries — already
+    // suffixed — resolve against the suffixed Qt libs bundled above.)
     task copyOCPN_CORE(type: Copy) {
-        from "${OCPN_Base}/${OCPN_Build}/libgorp.so"
+        from "${OCPN_Build}/libgorp.so"
         into 'src/main/jniLibs/armeabi-v7a'
+        rename ('libgorp.so', 'libgorp_armeabi-v7a.so')
     }
 
     task copyOCPN_CORE_64(type: Copy) {
-        from "${OCPN_Base}/${OCPN_Build_64}/libgorp.so"
+        from "${OCPN_Build_64}/libgorp.so"
         into 'src/main/jniLibs/arm64-v8a'
+        rename ('libgorp.so', 'libgorp_arm64-v8a.so')
     }
 
-    task copyOCPN_CORE_x86(type: Copy) {
-        from "${OCPN_Base}/${OCPN_Build_x86}/libgorp.so"
-        into 'src/main/jniLibs/x86'
-    }
 
-    task copyDRAW_PIFiles(type: Copy) {
-            from "/home/dsr/Projects/ocpn_draw_pi/build_android_64/libocpn_draw_pi.so"
-            into 'src/main/assets/files/plugins'
-            rename ('libocpn_draw_pi.so', 'libocpn_draw_pi.so64')
-    }
-
-    task copyDRAW_PIDataFiles(type: Copy) {
-        from "/home/dsr/Projects/ocpn_draw_pi/data"
-        into 'src/main/assets/files/plugins/ocpn_draw_pi/data'
-    }
 
-    task copyDRAW_PIDataIconsFiles(type: Copy) {
-        from "/home/dsr/Projects/ocpn_draw_pi/UserIcons"
-        into 'src/main/assets/files/plugins/ocpn_draw_pi/UserIcons'
-    }
-
-    task copyOESENC_PIFiles(type: Copy) {
-        from "/home/dsr/Projects/oesenc_pi/build_android_32/liboesenc_pi.so"
-        into 'src/main/assets/files/plugins'
-        rename ('liboesenc_pi.so', 'liboesenc_pi.so32')
-    }
-
-    task copyOESENC_PIFiles64(type: Copy) {
-        from "/home/dsr/Projects/oesenc_pi/build_android_64/liboesenc_pi.so"
-        into 'src/main/assets/files/plugins'
-        rename ('liboesenc_pi.so', 'liboesenc_pi.so64')
-    }
-
-    task copyOCHARTS_PIFiles(type: Copy) {
-        from "/home/dsr/Projects/o-charts_pi/build_android_64_cci_22b/libo-charts_pi.so"
-        into 'src/main/assets/files/plugins'
-        rename ('libo-charts_pi.so', 'libo-charts_pi.so64')
-    }
 
-    task copyCELESTIAL_PIFiles(type: Copy) {
-        from "/home/dsr/Projects/celestial_navigation_pi/build_a64/libcelestial_navigation_pi.so"
-        into 'src/main/assets/files/plugins'
-        rename ('libcelestial_navigation_pi.so', 'libcelestial_navigation_pi.so64')
-    }
 
-    task copyWarchdog_PIFiles64(type: Copy) {
-        from "/home/dsr/Projects/watchdog_pi/build_android_64_cci/libwatchdog_pi.so"
 
-        into 'src/main/assets/files/plugins'
-        rename ('libwatchdog_pi.so', 'libwatchdog_pi.so64')
-    }
 
-    task copyVDR_PIFiles64(type: Copy) {
-        from "/home/dsr/Projects/vdr_pi/build_android_64/libvdr_pi.so"
 
-        into 'src/main/assets/files/plugins'
-        rename ('libvdr_pi.so', 'libvdr_pi.so64')
-    }
 
-    task copySERVERFiles32(type: Copy) {
-        from "/home/dsr/Projects/o-charts_pi/libs/oeserverd/oeserverda_android/arm32/oexserverd"
-        into 'src/main/jniLibs/armeabi-v7a'
 
-        rename('oexserverd', 'liboexserverd.so')
-    }
 
-    task copySERVERFiles64(type: Copy) {
-        from "/home/dsr/Projects/o-charts_pi/libs/oeserverd/oeserverda_android/arm64/oexserverd"
-        into 'src/main/jniLibs/arm64-v8a'
 
-        rename('oexserverd', 'liboexserverd.so')
-    }
 
-    task copyPYPILOT_PIFiles32(type: Copy) {
-        from "/home/dsr/Projects/pypilot_pi/build_android_32/libpypilot_pi.so"
-        into 'src/main/assets/files/plugins'
-        rename ('libpypilot_pi.so', 'libpypilot_pi.so32')
-    }
 
-    task copyTEST_PIFiles32(type: Copy) {
-        from "/home/dsr/Projects/weather_routing_pi/build_android_32/libweather_routing_pi.so"
-        into 'src/main/assets/files/plugins'
-        rename ('libweather_routing_pi.so', 'libweather_routing_pi.so32')
-    }
 
-    task copySB_PIDataFiles(type: Copy) {
-        from "/home/dsr/Projects/statusbar_pi/data"
-        into 'src/main/assets/files/plugins/statusbar_pi/data'
-    }
 
-    task copySB_PIFiles32(type: Copy) {
-        from "/home/dsr/Projects/statusbar_pi/build_android_32/libstatusbar_pi.so"
-        into 'src/main/assets/files/plugins'
-        rename ('libstatusbar_pi.so', 'libstatusbar_pi.so32')
-    }
 
     gradle.projectsEvaluated {
         preBuild.dependsOn(copyENCSupportFiles)
@@ -632,17 +579,22 @@ dependencies {
         preBuild.dependsOn(copyLocalefiFIFiles)
         preBuild.dependsOn(copyLocaleitFiles)
 
-        preBuild.dependsOn(copyWMM_PIFiles)
-        preBuild.dependsOn(copyDNLDR_PIFiles)
-        preBuild.dependsOn(copyGRIB_PIFiles)
-        preBuild.dependsOn(copyDASHBOARD_PIFiles)
-        //preBuild.dependsOn(copySQUIDDIO_PIFiles)
+        // Per-arch plugin .so copies — only for the ABIs we actually built.
+        if ('armeabi-v7a' in ocpnAbis) {
+            preBuild.dependsOn(copyWMM_PIFiles)
+            preBuild.dependsOn(copyDNLDR_PIFiles)
+            preBuild.dependsOn(copyGRIB_PIFiles)
+            preBuild.dependsOn(copyDASHBOARD_PIFiles)
+            //preBuild.dependsOn(copySQUIDDIO_PIFiles)
+        }
 
-        preBuild.dependsOn(copyWMM_PIFiles64)
-        preBuild.dependsOn(copyDNLDR_PIFiles64)
-        preBuild.dependsOn(copyGRIB_PIFiles64)
-        preBuild.dependsOn(copyDASHBOARD_PIFiles64)
-        //preBuild.dependsOn(copySQUIDDIO_PIFiles64)
+        if ('arm64-v8a' in ocpnAbis) {
+            preBuild.dependsOn(copyWMM_PIFiles64)
+            preBuild.dependsOn(copyDNLDR_PIFiles64)
+            preBuild.dependsOn(copyGRIB_PIFiles64)
+            preBuild.dependsOn(copyDASHBOARD_PIFiles64)
+            //preBuild.dependsOn(copySQUIDDIO_PIFiles64)
+        }
 
         preBuild.dependsOn(copyWMM_PIDataFiles)
         preBuild.dependsOn(copyDNLDR_PIDataFiles)
@@ -655,38 +607,28 @@ dependencies {
         //preBuild.dependsOn(copyQTPlugins_armeabi_v7a)
         //preBuild.dependsOn(copyQTPlugins_arm64_v8a)
 
-        preBuild.dependsOn(copyQTLibs_armeabi_v7a)
-        preBuild.dependsOn(copyQTLibs_arm64_v8a)
-        //preBuild.dependsOn(copyQTLibs_x86)
+        // Per-arch Qt libs, libc++_shared.so and the core lib — only for the
+        // ABIs we actually built.
+        if ('armeabi-v7a' in ocpnAbis) {
+            preBuild.dependsOn(copyQTLibs_armeabi_v7a)
+            preBuild.dependsOn(copyCxxShared_armeabi_v7a)
+            preBuild.dependsOn(copyOCPN_CORE)
+        }
 
-        preBuild.dependsOn(copyOCPN_CORE)
-        preBuild.dependsOn(copyOCPN_CORE_64)
-        //preBuild.dependsOn(copyOCPN_CORE_x86)
+        if ('arm64-v8a' in ocpnAbis) {
+            preBuild.dependsOn(copyQTLibs_arm64_v8a)
+            preBuild.dependsOn(copyCxxShared_arm64_v8a)
+            preBuild.dependsOn(copyOCPN_CORE_64)
+        }
 
-        //preBuild.dependsOn(copyDRAW_PIFiles)
-        //preBuild.dependsOn(copyDRAW_PIDataFiles)
-        //preBuild.dependsOn(copyDRAW_PIDataIconsFiles)
 
-        //preBuild.dependsOn(copyOESENC_PIFiles)
-        //preBuild.dependsOn(copyOESENC_PIFiles64)
 
-        //preBuild.dependsOn(copyOCHARTS_PIFiles)
 
-        //preBuild.dependsOn(copyCELESTIAL_PIFiles)
 
-        preBuild.dependsOn(copySERVERFiles32)
-        preBuild.dependsOn(copySERVERFiles64)
 
-        //preBuild.dependsOn(copyVDR_PIFiles64)
 
-        //preBuild.dependsOn(copyWarchdog_PIFiles64)
-        //preBuild.dependsOn(copyPYPILOT_PIFiles32)
 
-        //preBuild.dependsOn(copyTEST_PIFiles32)
-        //preBuild.dependsOn(copyTEST_PIDataFiles)
 
-        //preBuild.dependsOn(copySB_PIFiles32)
-        //preBuild.dependsOn(copySB_PIDataFiles)
 
     }
 
diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
new file mode 100644
index 00000000..9f1ea977
--- /dev/null
+++ b/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+        <!-- Disable Firebase in debug builds: the bundled google-services.json
+             ships a placeholder API key, so FirebaseInitProvider crashes at
+             startup ("Please set a valid API key"). Removing the auto-init
+             provider keeps debug builds Firebase-free. Release builds are
+             unaffected (they get a real key injected in CI). -->
+        <provider
+            android:name="com.google.firebase.provider.FirebaseInitProvider"
+            android:authorities="${applicationId}.firebaseinitprovider"
+            tools:node="remove" />
+    </application>
+</manifest>
diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml
new file mode 100644
index 00000000..9f16c2a0
--- /dev/null
+++ b/app/src/debug/res/values/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Debug-only overrides. Android merges the debug source set over main/, so these
+  win for `assembleDebug` and leave the release build untouched.
+
+  Both strings are hardcoded to the base package in main/, not derived from
+  applicationId, so the ".debug" applicationIdSuffix alone would not move them:
+
+  - file_provider_authority: a provider authority must be unique across the whole
+    device. Stock OpenCPN declares the same one, so without this the debug build
+    fails to install (INSTALL_FAILED_CONFLICTING_PROVIDER).
+
+  - app_name: so the two are distinguishable in the launcher and task switcher
+    rather than both reading "OpenCPN".
+-->
+<resources>
+    <string name="app_name">OpenCPN (debug)</string>
+    <string name="file_provider_authority" translatable="false">org.opencpn.opencpn.debug.helpfile.fileprovider</string>
+</resources>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1c689dd..94d3e471 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -40,12 +40,13 @@
             <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
             <!-- Deploy Qt libs as part of package -->
             <meta-data android:name="android.app.bundle_local_qt_libs" android:value="1"/>
-            <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
-            <meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
             <!-- Run with local libs -->
             <meta-data android:name="android.app.use_local_qt_libs" android:value="1"/>
             <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="plugins/platforms/android/libqtforandroid.so"/>
+            <!-- Qt 5.14+ multi-ABI loader: plugins come from @array/load_local_libs
+                 ("<abi>;<lib.so>:..."), replacing 5.12's bundled_in_lib /
+                 bundled_in_assets / load_local_libs(value). See res/values/libs.xml. -->
+            <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="jar/QtAndroid.jar"/>
             <meta-data android:name="android.app.static_init_classes" android:value=""/>
             <!--  Messages maps -->
diff --git a/app/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java b/app/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
index c94f09a1..18005e00 100644
--- a/app/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
+++ b/app/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
@@ -5033,10 +5033,13 @@ public void onClick(DialogInterface dialog, int which) {
                 return;
             }
 
-            // add all bundled Qt libs to loader params
+            // add all bundled Qt libs to loader params ("<abi>;<name>" entries;
+            // keep this device's ABI). For OpenCPN this is the main lib, gorp_<abi>,
+            // which must be System.load()ed so its exported JNI symbols
+            // (Java_org_opencpn_OCPNNativeLib_*) resolve.
             ArrayList<String> libs = new ArrayList<String>();
             if (m_activityInfo.metaData.containsKey("android.app.bundled_libs_resource_id"))
-                libs.addAll(Arrays.asList(getResources().getStringArray(m_activityInfo.metaData.getInt("android.app.bundled_libs_resource_id"))));
+                libs.addAll(preferredAbiLibs(getResources().getStringArray(m_activityInfo.metaData.getInt("android.app.bundled_libs_resource_id"))));
 
             //  We want the default OCPN plugins bundled into the APK and installed
             //  into the proper app-lib.  So they are listed in ANDROID_EXTRA_LIBS.
@@ -5048,7 +5051,10 @@ public void onClick(DialogInterface dialog, int which) {
 
             String libName = null;
             if (m_activityInfo.metaData.containsKey("android.app.lib_name")) {
-                libName = m_activityInfo.metaData.getString("android.app.lib_name");
+                // Qt 5.14+ suffixes the main library with the ABI too:
+                // lib_name "gorp" -> libgorp_<abi>.so. preferredAbi was fixed by
+                // the qt_libs pass in startApp() before this method runs.
+                libName = m_activityInfo.metaData.getString("android.app.lib_name") + "_" + preferredAbi;
                 loaderParams.putString(MAIN_LIBRARY_KEY, libName); //main library contains main() function
             }
 
@@ -5440,6 +5446,42 @@ private void cleanOldCacheIfNecessary(String oldLocalPrefix, String localPrefix)
         }
     }
 
+    // Qt 5.14+ ships one multi-ABI Android build: every qt_libs / bundled_libs /
+    // load_local_libs entry is "<abi>;<name>". This helper (ported from Qt
+    // 5.15.2's QtLoader) keeps only the running device's preferred ABI and
+    // returns the bare <name> parts. The first array it processes fixes
+    // preferredAbi for the rest (main lib, plugins), so qt_libs must go first.
+    private final java.util.List<String> supportedAbis = java.util.Arrays.asList(Build.SUPPORTED_ABIS);
+    private String preferredAbi = null;
+
+    private ArrayList<String> preferredAbiLibs(String[] libs) {
+        java.util.HashMap<String, ArrayList<String>> abisLibs = new java.util.HashMap<String, ArrayList<String>>();
+        for (String lib : libs) {
+            String[] archLib = lib.split(";", 2);
+            if (archLib.length != 2)
+                continue;
+            if (preferredAbi != null && !archLib[0].equals(preferredAbi))
+                continue;
+            if (!abisLibs.containsKey(archLib[0]))
+                abisLibs.put(archLib[0], new ArrayList<String>());
+            abisLibs.get(archLib[0]).add(archLib[1]);
+        }
+
+        if (preferredAbi != null) {
+            if (abisLibs.containsKey(preferredAbi))
+                return abisLibs.get(preferredAbi);
+            return new ArrayList<String>();
+        }
+
+        for (String abi : supportedAbis) {
+            if (abisLibs.containsKey(abi)) {
+                preferredAbi = abi;
+                return abisLibs.get(abi);
+            }
+        }
+        return new ArrayList<String>();
+    }
+
     private void startApp(final boolean firstStart) {
         try {
             if (m_activityInfo.metaData.containsKey("android.app.qt_sources_resource_id")) {
@@ -5477,22 +5519,25 @@ private void startApp(final boolean firstStart) {
                 }
 
 
-                // Set up list of architecture dependent Qt libs to preload
+                // Set up list of architecture dependent Qt libs to preload. Entries
+                // are "<abi>;Name_<abi>"; keep this device's ABI and load
+                // lib<Name_<abi>>.so from the native lib dir. This also fixes
+                // preferredAbi, used below for the plugins and the main library.
                 if (m_qtLibs != null) {
-                    for (int i = 0; i < m_qtLibs.length; i++) {
-                        libraryList.add(m_nativeLibraryDir + "/lib" + m_qtLibs[i] + ".so");
-                    }
+                    for (String lib : preferredAbiLibs(m_qtLibs))
+                        libraryList.add(m_nativeLibraryDir + "/lib" + lib + ".so");
                 }
 
 
-                if (m_activityInfo.metaData.containsKey("android.app.load_local_libs")) {
-                    String[] extraLibs = m_activityInfo.metaData.getString("android.app.load_local_libs").split(":");
-                    for (String lib : extraLibs) {
-                        if (lib.length() > 0) {
-                            if (lib.startsWith("lib/"))
-                                libraryList.add(localPrefix + lib);
-                            else
-                                libraryList.add(pluginsPrefix + lib);
+                // Local plugins (platform, style, ...). Qt 5.14+ stores them as a
+                // resource array of "<abi>;<lib.so>[:<lib.so>...]"; they are packed
+                // into the APK's lib dir (jniLibs) under their real suffixed names.
+                if (m_activityInfo.metaData.containsKey("android.app.load_local_libs_resource_id")) {
+                    int resId = m_activityInfo.metaData.getInt("android.app.load_local_libs_resource_id");
+                    for (String libs : preferredAbiLibs(getResources().getStringArray(resId))) {
+                        for (String lib : libs.split(":")) {
+                            if (lib.length() > 0)
+                                libraryList.add(m_nativeLibraryDir + "/" + lib);
                         }
                     }
                 }
@@ -6840,7 +6885,12 @@ public void handleOnBackPressed() {
 
 
         try {
-            ApplicationInfo ainfo = this.getApplicationContext().getPackageManager().getApplicationInfo("org.opencpn.opencpn", PackageManager.GET_SHARED_LIBRARY_FILES);
+            // Look up *this* app's native library dir, not a hardcoded package
+            // name: with the debug build's ".debug" applicationIdSuffix the
+            // literal "org.opencpn.opencpn" would resolve to a stock install if
+            // present (loading its libgorp.so) or throw if not. getPackageName()
+            // returns the running package, suffix included.
+            ApplicationInfo ainfo = this.getApplicationContext().getPackageManager().getApplicationInfo(getPackageName(), PackageManager.GET_SHARED_LIBRARY_FILES);
             Log.i("OpenCPN", "native library dir " + ainfo.nativeLibraryDir);
             m_nativeLibraryDir = ainfo.nativeLibraryDir;
         } catch (Exception e) {
diff --git a/app/src/main/jniLibs/arm64-v8a/libc++_shared.so b/app/src/main/jniLibs/arm64-v8a/libc++_shared.so
deleted file mode 100755
index a80c8b38..00000000
Binary files a/app/src/main/jniLibs/arm64-v8a/libc++_shared.so and /dev/null differ
diff --git a/app/src/main/jniLibs/armeabi-v7a/libc++_shared.so b/app/src/main/jniLibs/armeabi-v7a/libc++_shared.so
deleted file mode 100755
index cbff8a90..00000000
Binary files a/app/src/main/jniLibs/armeabi-v7a/libc++_shared.so and /dev/null differ
diff --git a/app/src/main/res/values/libs.xml b/app/src/main/res/values/libs.xml
index 0453922e..a5791f5d 100644
--- a/app/src/main/res/values/libs.xml
+++ b/app/src/main/res/values/libs.xml
@@ -1,45 +1,65 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <array name="qt_sources">
-        <item>https://download.qt.io/ministro/android/qt5/qt-5.9</item>
-    </array>
+    <!-- Qt 5.15.2 (multi-ABI "android" build) loader format.
+         ==========================================================================
+         These arrays follow the Qt 5.14+ format that
+         org.qtproject.qt5.android.bindings.QtLoader parses: every item is
+         "<abi>;<name>", QtLoader keeps only the running device's preferred ABI,
+         and turns each qt_libs "<abi>;X" into lib<X>.so. They match the real files
+         staged by OpenCPN-builder (builder/scripts/install-qt-android.sh) and
+         bundled by app/build.gradle.
 
-    <!-- The following is handled automatically by the deployment tool. It should
-         not be edited manually. -->
+         NEEDS the checked-in bindings/*.java (the QtLoader that reads this file)
+         to be updated from 5.12 to 5.15.2 in lockstep — the 5.12 loader parses
+         these arrays differently. See TODO.md in OpenCPN-builder. -->
 
-    <!--<array name="bundled_libs">
-        <item>wx_baseu-3.1</item>
-        <item>wx_baseu_net-3.1</item>
-        <item>wx_baseu_xml-3.1</item>
-        <item>wx_qtu_core-3.1</item>
-        <item>wx_qtu_qa-3.1</item>
-        <item>wx_qtu_html-3.1</item>
-        <item>wx_qtu_adv-3.1</item>
-        <item>wx_qtu_aui-3.1</item>
-        <item>wx_qtu_gl-3.1</item>
-        <item>gorp</item>
-    </array> -->
+    <array name="qt_sources">
+        <item>https://download.qt.io/ministro/android/qt5/qt-5.14</item>
+    </array>
 
+    <!-- The main OpenCPN library. It must be listed here (not only as
+         android.app.lib_name) so QtNative System.load()s it on the Java side.
+         OpenCPN's JNI entry points use dynamic lookup — exported
+         Java_org_opencpn_OCPNNativeLib_* symbols (android/androidUTIL.cpp), with no
+         JNI_OnLoad/RegisterNatives — and the JVM only resolves those for libraries
+         loaded via System.load, NOT for the main lib that Qt dlopen()s in native
+         code. Omit it and OCPNNativeLib.onStart throws UnsatisfiedLinkError at
+         QtActivity.onStart. lib_name (=gorp) still marks it as the main() library.
+         (OpenSSL and wxWidgets are static inside libgorp, so there are no others.)
+         The name is gorp_<abi>, matching libgorp_<abi>.so bundled by build.gradle. -->
     <array name="bundled_libs">
-       <item>gorp</item>
+        <item>arm64-v8a;gorp_arm64-v8a</item>
+        <item>armeabi-v7a;gorp_armeabi-v7a</item>
     </array>
 
+    <!-- Qt shared libraries, loaded in dependency order (c++_shared first). Each
+         "<abi>;Name_<abi>" is loaded as lib<Name_<abi>>.so from the APK lib dir. -->
     <array name="qt_libs">
-         <item>c++_shared</item>
-         <item>Qt5Core</item>
-         <item>Qt5Gui</item>
-         <item>Qt5Widgets</item>
-         <item>Qt5OpenGL</item>
-         <item>Qt5Test</item>
-         <item>Qt5AndroidExtras</item>
-     </array>
-
-    <array name="bundled_in_lib">
-        <item>libplugins_styles_libqandroidstyle.so:plugins/styles/libqandroidstyle.so</item>
-        <item>libplugins_platforms_android_libqtforandroid.so:plugins/platforms/android/libqtforandroid.so</item>
+        <item>arm64-v8a;c++_shared</item>
+        <item>arm64-v8a;Qt5Core_arm64-v8a</item>
+        <item>arm64-v8a;Qt5Gui_arm64-v8a</item>
+        <item>arm64-v8a;Qt5Widgets_arm64-v8a</item>
+        <item>arm64-v8a;Qt5OpenGL_arm64-v8a</item>
+        <item>arm64-v8a;Qt5Test_arm64-v8a</item>
+        <item>arm64-v8a;Qt5AndroidExtras_arm64-v8a</item>
+        <item>armeabi-v7a;c++_shared</item>
+        <item>armeabi-v7a;Qt5Core_armeabi-v7a</item>
+        <item>armeabi-v7a;Qt5Gui_armeabi-v7a</item>
+        <item>armeabi-v7a;Qt5Widgets_armeabi-v7a</item>
+        <item>armeabi-v7a;Qt5OpenGL_armeabi-v7a</item>
+        <item>armeabi-v7a;Qt5Test_armeabi-v7a</item>
+        <item>armeabi-v7a;Qt5AndroidExtras_armeabi-v7a</item>
     </array>
 
-    <array name="bundled_in_assets">
+    <!-- Local plugins, loaded after qt_libs. Each item is
+         "<abi>;<full-lib-filename>[:<full-lib-filename>...]" — the real Qt 5.15.2
+         plugin filenames staged into jniLibs by app/build.gradle. (Replaces the
+         5.12 bundled_in_lib/bundled_in_assets arrays.) The imageformats plugins
+         (qjpeg/qgif/qico) are also staged and can be appended here if OpenCPN
+         needs them at runtime. -->
+    <array name="load_local_libs">
+        <item>arm64-v8a;libplugins_platforms_qtforandroid_arm64-v8a.so:libplugins_styles_qandroidstyle_arm64-v8a.so</item>
+        <item>armeabi-v7a;libplugins_platforms_qtforandroid_armeabi-v7a.so:libplugins_styles_qandroidstyle_armeabi-v7a.so</item>
     </array>
 
 </resources>
diff --git a/build.gradle b/build.gradle
index a6b1447c..ef8a0ae7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,9 +12,10 @@ ext.kotlin_version = '1.8.22'
 
 allprojects {
 
+    // jcenter() removed: the service is shut down, and Gradle fails or stalls on
+    // it. Everything here resolves from google()/mavenCentral().
     repositories {
         google()
-        jcenter()
         mavenCentral()
     }
 }
diff --git a/lobsterpicker/build.gradle b/lobsterpicker/build.gradle
index cce03ef7..a68ad6f4 100644
--- a/lobsterpicker/build.gradle
+++ b/lobsterpicker/build.gradle
@@ -1,7 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 33
+    // Kept in step with app/: one compileSdk across the project means the
+    // builder image needs one SDK platform, not three. Compile-time only —
+    // targetSdkVersion below is what governs runtime behaviour, and for a
+    // library module even that is overridden by the consuming app.
+    compileSdkVersion 35
 
 
     defaultConfig {
diff --git a/materialfilemanager/src/main/AndroidManifest.xml b/materialfilemanager/src/main/AndroidManifest.xml
index 35d07793..434e7f1c 100755
--- a/materialfilemanager/src/main/AndroidManifest.xml
+++ b/materialfilemanager/src/main/AndroidManifest.xml
@@ -134,21 +134,32 @@
             android:name=".service.ZipService"
             android:exported="false" />
 
+        <!--
+          Authorities are ${applicationId}-relative so the debug build (with its
+          ".debug" applicationIdSuffix) does not collide with a stock OpenCPN:
+          provider authorities must be unique across the whole device, and a
+          hardcoded "bms.ocpnfilemanager.*" fails to install alongside stock with
+          INSTALL_FAILED_CONFLICTING_PROVIDER. The manifest merger substitutes
+          the consuming app's final applicationId. Nothing in this module
+          resolves against these authorities anyway — the Java CONTENT_URIs point
+          at the unrelated "bms.myfilemanager.*"/"com.veniosg.dir.*" strings — so
+          renaming them is inert beyond making the registration unique.
+        -->
         <provider
             android:name=".provider.BookmarkProvider"
-            android:authorities="bms.ocpnfilemanager.bookmarks"
+            android:authorities="${applicationId}.ocpnfilemanager.bookmarks"
             android:exported="false" />
         <provider
             android:name=".provider.SearchResultsProvider"
-            android:authorities="bms.ocpnfilemanager.search"
+            android:authorities="${applicationId}.ocpnfilemanager.search"
             android:exported="false" />
         <provider
             android:name=".provider.SearchSuggestionsProvider"
-            android:authorities="bms.ocpnfilemanager.search.suggest"
+            android:authorities="${applicationId}.ocpnfilemanager.search.suggest"
             android:exported="false" />
         <provider
             android:name=".provider.FileManagerProvider"
-            android:authorities="bms.ocpnfilemanager.filemanager"
+            android:authorities="${applicationId}.ocpnfilemanager.filemanager"
             android:exported="false"
             android:permission="android.permission.READ_EXTERNAL_STORAGE" />
 
diff --git a/settings.gradle b/settings.gradle
index 849b0da0..ee08734d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -3,10 +3,12 @@ pluginManagement {
         google()
         mavenCentral()
         gradlePluginPortal()
-        jcenter()
     }
 }
 
-include ':app', ':afilechooser', ':afilechooser2', ':lobsterpicker'
+// ':afilechooser' is gone -- there is no such directory, and nothing depends on
+// it (app uses ':afilechooser2'). Likewise 'FileManager/' is present but is not
+// a module here and is not referenced.
+include ':app', ':afilechooser2', ':lobsterpicker'
 
 include ':materialfilemanager'