Merge pull request #15 from saschpe/android-35

Add Android API 35

Author: saschpe

.github/workflows/ci.yml

@@ -26,9 +26,9 @@ jobs:
     strategy:
       max-parallel: 3
       matrix:
-        jdk: [ 17.0.10_7, 21.0.2_13, 22.0.1_8 ]
-        android: [ 32, 33, 34 ]
-        ndk: [ 25.2.9519653, 26.3.11579264 ]
+        jdk: [ 17.0.12_7, 21.0.4_7, 22.0.2_9 ]
+        android: [ 34, 35 ]
+        ndk: [ 26.3.11579264, 27.0.12077973 ]
         cmake: [ 3.22.1 ]
     steps:
       - name: Checkout

Dockerfile

@@ -10,16 +10,18 @@
 #   $ ./scripts/build --android 34 --jdk 22.0.1_8 --ndk 25.2.9519653 --cmake 3.22.1
 #
 
-ARG jdk=22.0.1_8
-ARG android=34
+ARG jdk=22.0.2_9
+ARG android=35
 
 FROM saschpe/android-sdk:${android}-jdk${jdk}
+ARG android
 ARG cmake=3.22.1
-ARG ndk=26.2.11394342
+ARG jdk
+ARG ndk=27.0.12077973
 LABEL maintainer="Sascha Peilicke <[email protected]"
 LABEL description="Android NDK ${ndk} with CMake ${cmake} on SDK ${android} using JDK ${jdk}"
 
-ENV NDK_ROOT "${ANDROID_SDK_ROOT}/ndk/${ndk}"
+ENV NDK_ROOT="${ANDROID_SDK_ROOT}/ndk/${ndk}"
 RUN sdkmanager --install \
     "cmake;${cmake}" \
     "ndk;${ndk}"

README.md

@@ -15,12 +15,14 @@ available:
 
 |    | 11 | 17 | 21 | 22 |
 |----|----|----|----|----|
-| 31 | ✅ | ✅ |    |    |
-| 32 | ✅ | ✅ | ✅ | ✅ |
-| 33 | ✅ | ✅ | ✅ | ✅ |
-| 34 | ✅ | ✅ | ✅ | ✅ |
-
-* Android NDK versions: __25.2.9519653__ and __26.2.11394342__
+| 31 | ✅  | ✅  |    |    |
+| 32 | ✅  | ✅  | ✅  | ✅  |
+| 33 | ✅  | ✅  | ✅  | ✅  |
+| 34 | ✅  | ✅  | ✅  | ✅  |
+| 35 |    | ✅  | ✅  | ✅  |
+
+* Android 35 image NDK versions: __26.2.11394342__ and __27.0.12077973__
+* Older Android image NDK versions: __25.2.9519653__ and __26.2.11394342__
 * CMake version: __3.22.1__
 
 ## Usage

scripts/build

@@ -83,7 +83,7 @@ else
   approve "Build image '${image_tag}'"
 fi
 
-safe docker buildx build \
+safe docker build \
   --platform "${platforms}" \
   ${buildx_command} \
   --build-arg android="${android}" \