NDK root, again...

Another atempt to set the NDK path...
Added missing NDK path
2024-11-24 03:35:53 +01:00 · 2022-07-31 17:10:32 +02:00 · 2022-07-31 16:51:39 +02:00 · 2022-07-31 16:43:32 +02:00 · 2022-07-31 14:22:51 +02:00 · 2022-07-31 14:05:46 +02:00
3 changed files with 11 additions and 7 deletions
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@ -11,10 +11,11 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
      - name: set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
        with:
+          distribution: 'zulu'
          java-version: '11'
      - name: Setup Android SDK
        uses: android-actions/setup-android@v2
@ -22,16 +23,18 @@ jobs:
        run:  ${ANDROID_HOME}/tools/bin/sdkmanager --update
      - name: Install android platform, platform-tools, build-tools and ndk
        run:  ${ANDROID_HOME}/tools/bin/sdkmanager --install "cmdline-tools;latest" "platform-tools" "platforms;android-31" "build-tools;31.0.0" "ndk;22.1.7171670"
+      - name: Setup NDK path
+        run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/22.1.7171670/" >> $GITHUB_ENV
      - name: Install Qt (Desktop)
        uses: jurplel/install-qt-action@v2
        with:
          aqtversion: '==2.1.0'
-          version: '6.3.0'
+          version: '6.3.1'
      - name: Install Qt (Android)
        uses: jurplel/install-qt-action@v2
        with:
          aqtversion: '==2.1.0'
-          version: '6.3.0'
+          version: '6.3.1'
          target: 'android'
          arch: 'android_armv7'
          modules: qtpositioning qt5compat
@ -40,7 +43,7 @@ jobs:
      - name: Create localization
        run:  lrelease gpxsee.pro
      - name: Configure build
-        run:  qmake gpxsee.pro OPENSSL_PATH=android_openssl
+        run:  qmake gpxsee.pro OPENSSL_PATH=android_openssl 
      - name: Build project
        run:  make -j2 apk
      - name: Upload artifacts
--- a/README.md
+++ b/README.md
@ -11,7 +11,7 @@ GPS log file formats.
 * Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases,
  Garmin IMG/GMAP & JNX maps, TwoNav RMaps, GeoTIFF images, BSB charts, KMZ maps,
  AlpineQuest maps, Locus/OsmAnd/RMaps SQLite maps, Mapsforge vector maps,
-  QCT maps, ESRI World-File georeferenced images).
+  QCT maps, GEMF maps, Osmdroid SQLite maps, ESRI World-File georeferenced images).
 * Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts
  graphs.
 * Support for DEM files (SRTM HGT).
--- a/gpxsee.pro
+++ b/gpxsee.pro
@ -506,7 +506,8 @@ win32 {
        icons/formats/omd.ico \
        icons/formats/ghp.ico \
        icons/formats/qct.ico \
-        icons/formats/trk.ico
+        icons/formats/trk.ico \
+        icons/formats/gemf.ico
    DEFINES += _USE_MATH_DEFINES \
        NOGDI
 }
Author	SHA1	Message	Date
Martin Tůma	ec68557de5	NDK root, again...	2022-07-31 17:10:32 +02:00
Martin Tůma	c68fc72387	Another atempt to set the NDK path...	2022-07-31 16:51:39 +02:00
Martin Tůma	3c9da66a51	Added missing NDK path	2022-07-31 16:43:32 +02:00
Martin Tůma	22e56e06fd	Back to qt install @v2	2022-07-31 14:22:51 +02:00
Martin Tůma	2e9d173f53	Added missing Java distribution	2022-07-31 14:05:46 +02:00
Martin Tůma	84b7da13f0	Some more CI tools version updates	2022-07-31 14:00:51 +02:00
Martin Tůma	ed74d0c069	Updated Qt/Qt install action versions	2022-07-31 13:51:27 +02:00
Martin Tůma	218eb3be56	Added GEMF and Osmdroid SQLite maps support info	2022-07-31 13:43:46 +02:00
Martin Tůma	5795395107	Added missing GEMF icon resource entry	2022-07-31 13:22:33 +02:00