default to android sdk 23, not 28

geode-sdk · Jan 20, 2024 · feeb562 · feeb562
1 parent d6b1dab
commit feeb562
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -45,6 +45,9 @@ This repository contains two actions, one for just building the mods, and anothe
 
     # Which commit/branch to use for bindings. Defaults to latest commit in main branch. Not required.
     bindings-ref: ''
+
+    # The android min SDK version to target. Defaults to 23. Not required.
+    android-min-sdk: ''
 ```
 
 # Examples

diff --git a/action.yml b/action.yml
@@ -42,6 +42,10 @@ inputs:
     description: Which commit/branch to use for bindings. Defaults to latest commit in main branch
     required: false
     default: ""
+  android-min-sdk:
+    description: The android min SDK version to target. Defaults to 23
+    required: false
+    default: 23
 
 outputs:
   build-output:
@@ -177,9 +181,9 @@ runs:
         elif [ ${{ steps.platform.outputs.id }} = "mac" ]; then
           CMAKE_EXTRA_ARGS="-DCMAKE_BUILD_TYPE=${{ inputs.build-config }} -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13"
         elif [ ${{ steps.platform.outputs.target }} = "Android32" ]; then
-          CMAKE_EXTRA_ARGS="-DCMAKE_BUILD_TYPE=${{ inputs.build-config }} -DCMAKE_TOOLCHAIN_FILE=$NDK_HOME/build/cmake/android.toolchain.cmake -DANDROID_ABI=armeabi-v7a -DANDROID_PLATFORM=android-28 -DGEODE_DONT_BUILD_TEST_MODS=1 -G Ninja"
+          CMAKE_EXTRA_ARGS="-DCMAKE_BUILD_TYPE=${{ inputs.build-config }} -DCMAKE_TOOLCHAIN_FILE=$NDK_HOME/build/cmake/android.toolchain.cmake -DANDROID_ABI=armeabi-v7a -DANDROID_PLATFORM=android-${{ inputs.android-min-sdk }} -DGEODE_DONT_BUILD_TEST_MODS=1 -G Ninja"
         elif [ ${{ steps.platform.outputs.target }} = "Android64" ]; then
-          CMAKE_EXTRA_ARGS="-DCMAKE_BUILD_TYPE=${{ inputs.build-config }} -DCMAKE_TOOLCHAIN_FILE=$NDK_HOME/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DANDROID_PLATFORM=android-28 -DGEODE_DONT_BUILD_TEST_MODS=1 -G Ninja"
+          CMAKE_EXTRA_ARGS="-DCMAKE_BUILD_TYPE=${{ inputs.build-config }} -DCMAKE_TOOLCHAIN_FILE=$NDK_HOME/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DANDROID_PLATFORM=android-${{ inputs.android-min-sdk }} -DGEODE_DONT_BUILD_TEST_MODS=1 -G Ninja"
         fi
         cmake -B build $CMAKE_EXTRA_ARGS -DGEODE_DONT_INSTALL_MODS=On -DGEODE_TARGET_PLATFORM=${{ steps.platform.outputs.target }} ${{ inputs.configure-args }}
         cmake --build build --config ${{ inputs.build-config }} ${{ inputs.build-args }}