Skip to content

Commit

Permalink
Tidy up gradle scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
floppyhammer committed Mar 20, 2024
1 parent 01f4a6c commit 336c54e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
7 changes: 3 additions & 4 deletions demo/android-gles/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,16 @@ def minPlatformVersion = 24 // openGLES 3.2 min api level
// def minPlatformVersion = 12 // openGLES 2 min api level

android {
compileSdkVersion 32
compileSdkVersion 34
ndkVersion '22.1.7171670'

defaultConfig {
applicationId 'graphics.pathfinder.gles'
minSdkVersion "${minPlatformVersion}"
targetSdkVersion 32
targetSdkVersion 34
externalNativeBuild {
cmake {
arguments '-DANDROID_STL=c++_static'
arguments "-DCMAKE_BUILD_TYPE=Release" // Optional.
arguments '-DANDROID_STL=c++_static', "-DCMAKE_BUILD_TYPE=Release"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions demo/android-vulkan/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 33
compileSdkVersion 34
ndkVersion "23.1.7779620"

defaultConfig {
applicationId "graphics.pathfinder.vulkan"
minSdkVersion 24
targetSdkVersion 33
targetSdkVersion 34

// Shader compilation directives, put glsl shaders to app/src/main/shaders.
// Android Studio will pick them up and compile them into APK/assets/shaders.
Expand All @@ -19,7 +19,7 @@ android {
externalNativeBuild {
cmake {
abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_static'
arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_static', "-DCMAKE_BUILD_TYPE=Release"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion demo/android-vulkan/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ allprojects {
}
}

task clean(type: Delete) {
tasks.register('clean', Delete) {
delete rootProject.buildDir
}

0 comments on commit 336c54e

Please sign in to comment.