Skip to content

Commit 49b52e6

Browse files
committed
Build tests
1 parent 3baeef2 commit 49b52e6

File tree

2 files changed

+24
-4
lines changed

2 files changed

+24
-4
lines changed

config.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ext {
22
versions = [
33
gradlePluginVersion : '8.6.1',
44
compileSdk : 35,
5-
minSdk : 21,
5+
minSdk : 24,
66
targetSdk : 35,
77
// Update the Java version in the github workflows when this is updated.
88
javaVersion : JavaVersion.VERSION_17,

validation_layers/build.gradle

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,24 @@ android {
2323
//noinspection ChromeOsAbiSupport
2424
abiFilters "arm64-v8a", "x86_64"
2525
}
26+
// externalNativeBuild {
27+
// cmake {
28+
// arguments "-DBUILD_TESTS=OFF",
29+
// "-DBUILD_CONFORMANCE_TESTS=OFF",
30+
// "-DBUILD_LOADER=OFF",
31+
// "-DBUILD_API_LAYERS=YES",
32+
// // CMake may not detect OpenGL ES support, so we force it to be on.
33+
// "-DCMAKE_C_FLAGS=-DXR_USE_GRAPHICS_API_OPENGL_ES",
34+
// "-DCMAKE_CXX_FLAGS=-DXR_USE_GRAPHICS_API_OPENGL_ES"
35+
// }
36+
// }
2637
}
38+
// externalNativeBuild {
39+
// cmake {
40+
// path file('../thirdparty/openxr-source/CMakeLists.txt')
41+
// version "3.22.1"
42+
// }
43+
// }
2744

2845
namespace = "org.godotengine.openxr.validation_layers"
2946

@@ -62,19 +79,22 @@ task buildOpenxrValidationLayersAndroid {
6279
def libraryTargetDir = file("${khronosOpenxrValidationLayersAndroidLibraryTargetDir}/${abi}/${abi}")
6380
def jsonTargetDir = file("${khronosOpenxrValidationLayersAndroidAssetsTargetDir}/${abi}/openxr/1/api_layers/implicit.d")
6481
def buildDir = file("${khronosOpenxrValidationLayersAndroidBuildDir}/${abi}")
82+
def ndkDirectory = android.ndkDirectory.toString().replaceAll("\\\\", "/")
83+
println("FHK - Ndk directory: $ndkDirectory")
84+
println("FHK - Sdk directory: ${android.sdkDirectory}")
6585

6686
tasks.create(name: "configureOpenxrValidationLayersAndroid${suffix}", type: Exec) {
6787
doFirst {
6888
buildDir.mkdirs()
6989
}
7090
workingDir buildDir
7191
commandLine [
72-
"cmake",
92+
"C:/Users/fhuya/AppData/Local/Android/Sdk/cmake/3.22.1/bin/cmake",
7393
"${khronosOpenxrSourceDir}",
7494
"-DCMAKE_SYSTEM_NAME=Android",
7595
"-DCMAKE_SYSTEM_VERSION=${versions.targetSdk}",
7696
"-DCMAKE_ANDROID_ARCH_ABI=${abi}",
77-
"-DCMAKE_ANDROID_NDK=${android.ndkDirectory}",
97+
"-DCMAKE_ANDROID_NDK=${ndkDirectory}",
7898
"-DCMAKE_BUILD_TYPE=Release",
7999
"-DBUILD_TESTS=OFF",
80100
"-DBUILD_CONFORMANCE_TESTS=OFF",
@@ -88,7 +108,7 @@ task buildOpenxrValidationLayersAndroid {
88108

89109
tasks.create(name: "buildOpenxrValidationLayersAndroid${suffix}", type: Exec) {
90110
workingDir buildDir
91-
commandLine "cmake", "--build", ".", "--verbose"
111+
commandLine "C:/Users/fhuya/AppData/Local/Android/Sdk/cmake/3.22.1/bin/cmake", "--build", ".", "--verbose"
92112
dependsOn "configureOpenxrValidationLayersAndroid${suffix}"
93113
}
94114

0 commit comments

Comments
 (0)