workaround crash using android ndk>22

The crash occurs in exception handling at osmscout::FileScanner::Close() line 267: >> throw IOException(filename,"Cannot close file","File already closed"); So workaround calling FileScanner::CloseFailsafe(), which is noexcept
janbar · Oct 17, 2024 · 8a38512 · 8a38512
1 parent 9576ac1
commit 8a38512
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 10 deletions.
diff --git a/.github/workflows/build_android_x64.yml b/.github/workflows/build_android_x64.yml
@@ -29,13 +29,13 @@ jobs:
       - name: Setup Android SDK tools
         uses: android-actions/setup-android@v3
         with:
-          packages: "platform-tools platforms;android-31 build-tools;31.0.0 ndk;22.1.7171670"
+          packages: "platform-tools platforms;android-31 build-tools;31.0.0 ndk;26.3.11579264"
       - name: Dump Android NDK
         run: "ls ${ANDROID_HOME}/ndk"
 
       - name: Configure ENV
         run:  |
-            echo "ANDROID_NDK=${ANDROID_HOME}/ndk/22.1.7171670" >> $GITHUB_ENV
+            echo "ANDROID_NDK=${ANDROID_HOME}/ndk/26.3.11579264" >> $GITHUB_ENV
             echo "QT_DIR=${HOME}/Qt/5.15.15/android" >> $GITHUB_ENV
 
       - name: Cache Qt

diff --git a/android/linux-build-arm64-qt515.sh b/android/linux-build-arm64-qt515.sh
@@ -4,7 +4,7 @@ mkdir -p $BUILD_DIR
 
 export JAVA_HOME=$HOME/bin/java/jdk-17.0.12
 export ANDROID_SDK_ROOT=$HOME/bin/android/sdk
-export ANDROID_NDK=$HOME/bin/android/sdk/ndk/22.1.7171670
+export ANDROID_NDK=$HOME/bin/android/sdk/ndk/26.3.11579264
 export QT_DIR=$HOME/bin/Qt/5.15.15/android
 
 cmake .. -B $BUILD_DIR -DCMAKE_SYSTEM_NAME=Android \

diff --git a/android/linux-build-armv7-qt515.sh b/android/linux-build-armv7-qt515.sh
@@ -4,7 +4,7 @@ mkdir -p $BUILD_DIR
 
 export JAVA_HOME=$HOME/bin/java/jdk-17.0.12
 export ANDROID_SDK_ROOT=$HOME/bin/android/sdk
-export ANDROID_NDK=$HOME/bin/android/sdk/ndk/22.1.7171670
+export ANDROID_NDK=$HOME/bin/android/sdk/ndk/26.3.11579264
 export QT_DIR=$HOME/bin/Qt/5.15.15/android
 
 cmake .. -B $BUILD_DIR -DCMAKE_SYSTEM_NAME=Android \

diff --git a/android/linux-build-x64-qt515.sh b/android/linux-build-x64-qt515.sh
@@ -4,7 +4,7 @@ mkdir -p $BUILD_DIR
 
 export JAVA_HOME=$HOME/bin/java/jdk-17.0.12
 export ANDROID_SDK_ROOT=$HOME/bin/android/sdk
-export ANDROID_NDK=$HOME/bin/android/sdk/ndk/22.1.7171670
+export ANDROID_NDK=$HOME/bin/android/sdk/ndk/26.3.11579264
 export QT_DIR=$HOME/bin/Qt/5.15.15/android
 
 cmake .. -B $BUILD_DIR -DCMAKE_SYSTEM_NAME=Android \

diff --git a/android/linux-build-x86-qt515.sh b/android/linux-build-x86-qt515.sh
@@ -4,7 +4,7 @@ mkdir -p $BUILD_DIR
 
 export JAVA_HOME=$HOME/bin/java/jdk-17.0.12
 export ANDROID_SDK_ROOT=$HOME/bin/android/sdk
-export ANDROID_NDK=$HOME/bin/android/sdk/ndk/22.1.7171670
+export ANDROID_NDK=$HOME/bin/android/sdk/ndk/26.3.11579264
 export QT_DIR=$HOME/bin/Qt/5.15.15/android
 
 cmake .. -B $BUILD_DIR -DCMAKE_SYSTEM_NAME=Android \

diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt
@@ -188,7 +188,7 @@ set(libosmscout_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/libosmscout")
 
 # First apply our patches in the source of lib
 list(APPEND libosmscout_patches
-  libosmscout.cpp17.patch
+  libosmscout.2.patch
 )
 foreach(patch IN LISTS libosmscout_patches)
     execute_process(

diff --git a/backend/libosmscout.2.patch b/backend/libosmscout.2.patch
@@ -0,0 +1,18 @@
+diff --git a/libosmscout/src/osmscout/db/LocationIndex.cpp b/libosmscout/src/osmscout/db/LocationIndex.cpp
+index 991eead42..d34241f43 100644
+--- a/libosmscout/src/osmscout/db/LocationIndex.cpp
++++ b/libosmscout/src/osmscout/db/LocationIndex.cpp
+@@ -133,12 +133,7 @@ namespace osmscout {
+
+   void LocationIndex::FileScannerPool::Destroy(FileScanner* o) noexcept
+   {
+-    try{
+-      o->Close();
+-    } catch (const IOException& e) {
+-      log.Error() << e.GetDescription();
+-      o->CloseFailsafe();
+-    }
++    o->CloseFailsafe();
+     delete o;
+   }
+
diff --git a/backend/libosmscout.cpp17.patch b/backend/libosmscout.cpp17.patch
@@ -1,13 +1,17 @@
 diff --git a/libosmscout/include/osmscout/feature/ChargingStationFeature.h b/libosmscout/include/osmscout/feature/ChargingStationFeature.h
-index be79544e6..7e376ed2c 100644
+index be79544e6..48c2cb10d 100644
 --- a/libosmscout/include/osmscout/feature/ChargingStationFeature.h
 +++ b/libosmscout/include/osmscout/feature/ChargingStationFeature.h
-@@ -51,7 +51,7 @@ namespace osmscout {
+@@ -51,7 +51,11 @@ namespace osmscout {
        uint8_t     capacity;
        std::string output;
 
 -      std::strong_ordering operator<=>(const Socket& other) const = default;
-+      bool operator==(const Socket& other) const = default;
++      bool operator==(const Socket& other) const {
++        return this->type == other.type &&
++               this->capacity == other.capacity &&
++               this->output == other.output;
++      }
      };
 
    private: