revert android ndk 26 to 22

Using ndk 26 cause a crash when breaking a search location thread: Fatal signal 11 (SIGSEGV), code 128 (SI_KERNEL), fault addr 0x0 in tid 14575 (Thread (pooled)), pid 14423 (ub.janbar.osmin) Cmdline: io.github.janbar.osmin 00 pc 00000000005eb184 /data/app/~~YDirvjS2hwCsAasWJrYz6Q==/io.github.janbar.osmin-GM-r9Rlz2jEgIeFV9mn0Og==/lib/arm64/libosmin_arm64-v8a.so (osmscout::FileScanner::Close()+328) (BuildId: 1d7d09a1ebb8b12fb010266ec70de2e79ecd8c67) 01 pc 000000000064eb84 /data/app/~~YDirvjS2hwCsAasWJrYz6Q==/io.github.janbar.osmin-GM-r9Rlz2jEgIeFV9mn0Og==/lib/arm64/libosmin_arm64-v8a.so (osmscout::LocationIndex::FileScannerPool::Destroy(osmscout::FileScanner*)+40) (BuildId: 1d7d09a1ebb8b12fb010266ec70de2e79ecd8c67) 02 pc 0000000000631c1c /data/app/~~YDirvjS2hwCsAasWJrYz6Q==/io.github.janbar.osmin-GM-r9Rlz2jEgIeFV9mn0Og==/lib/arm64/libosmin_arm64-v8a.so (osmscout::ObjectPool<osmscout::FileScanner>::Return(osmscout::FileScanner*)+116) (BuildId: 1d7d09a1ebb8b12fb010266ec70de2e79ecd8c67) 03 pc 0000000000651930 /data/app/~~YDirvjS2hwCsAasWJrYz6Q==/io.github.janbar.osmin-GM-r9Rlz2jEgIeFV9mn0Og==/lib/arm64/libosmin_arm64-v8a.so (osmscout::LocationIndex::VisitAdminRegions(osmscout::AdminRegionVisitor&) const+520) (BuildId: 1d7d09a1ebb8b12fb010266ec70de2e79ecd8c67) 04 pc 000000000079977c /data/app/~~YDirvjS2hwCsAasWJrYz6Q==/io.github.janbar.osmin-GM-r9Rlz2jEgIeFV9mn0Og==/lib/arm64/libosmin_arm64-v8a.so (osmscout::LocationService::SearchForLocationByString(osmscout::LocationStringSearchParameter const&, osmscout::LocationSearchResult&) const+1432) (BuildId: 1d7d09a1ebb8b12fb010266ec70de2e79ecd8c67) 05 pc 00000000007a702c /data/app/~~YDirvjS2hwCsAasWJrYz6Q==/io.github.janbar.osmin-GM-r9Rlz2jEgIeFV9mn0Og==/lib/arm64/libosmin_arm64-v8a.so (osmscout::SearchLocationsRunnable::SearchLocations(std::__ndk1::shared_ptr<osmscout::DBInstance>&, QString const&, std::__ndk1::shared_ptr<osmscout::AdminRegion> const&, int, std::__ndk1::shared_ptr<osmscout::Breaker>&, std::__ndk1::map<unsigned long, std::__ndk1::shared_ptr<osmscout::AdminRegion>, std::__ndk1::less<unsigned long>, std::__ndk1::allocator<std::__ndk1::pair<unsigned long const, std::__ndk1::shared_ptr<osmscout::AdminRegion> > > >&)+660) (BuildId: 1d7d09a1ebb8b12fb010266ec70de2e79ecd8c67) 06 pc 00000000007a6158 /data/app/~~YDirvjS2hwCsAasWJrYz6Q==/io.github.janbar.osmin-GM-r9Rlz2jEgIeFV9mn0Og==/lib/arm64/libosmin_arm64-v8a.so (osmscout::SearchLocationsRunnable::run()+420) (BuildId: 1d7d09a1ebb8b12fb010266ec70de2e79ecd8c67) 07 pc 00000000000c1520 /data/app/~~YDirvjS2hwCsAasWJrYz6Q==/io.github.janbar.osmin-GM-r9Rlz2jEgIeFV9mn0Og==/lib/arm64/libQt5Core_arm64-v8a.so (BuildId: 9f423f0601cb34a19ac7172e251eeeeb0db08ebd) 08 pc 00000000000bf0b0 /data/app/~~YDirvjS2hwCsAasWJrYz6Q==/io.github.janbar.osmin-GM-r9Rlz2jEgIeFV9mn0Og==/lib/arm64/libQt5Core_arm64-v8a.so (BuildId: 9f423f0601cb34a19ac7172e251eeeeb0db08ebd) So revert to ndk 22 during the investigations.
janbar · Oct 16, 2024 · 0838093 · 0838093
1 parent c664a39
commit 0838093
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 4 deletions.
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/26.3.11579264
+export ANDROID_NDK=$HOME/bin/android/sdk/ndk/22.1.7171670
 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/26.3.11579264
+export ANDROID_NDK=$HOME/bin/android/sdk/ndk/22.1.7171670
 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/26.3.11579264
+export ANDROID_NDK=$HOME/bin/android/sdk/ndk/22.1.7171670
 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/26.3.11579264
+export ANDROID_NDK=$HOME/bin/android/sdk/ndk/22.1.7171670
 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,6 +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
 )
 foreach(patch IN LISTS libosmscout_patches)
     execute_process(

diff --git a/backend/libosmscout.cpp17.patch b/backend/libosmscout.cpp17.patch
@@ -0,0 +1,13 @@
+diff --git a/libosmscout/include/osmscout/feature/ChargingStationFeature.h b/libosmscout/include/osmscout/feature/ChargingStationFeature.h
+index be79544e6..7e376ed2c 100644
+--- a/libosmscout/include/osmscout/feature/ChargingStationFeature.h
++++ b/libosmscout/include/osmscout/feature/ChargingStationFeature.h
+@@ -51,7 +51,7 @@ namespace osmscout {
+       uint8_t     capacity;
+       std::string output;
+
+-      std::strong_ordering operator<=>(const Socket& other) const = default;
++      bool operator==(const Socket& other) const = default;
+     };
+
+   private: