Switch to the Khronos OpenXR Loader for Android gradle dependency (#182)

Build config updated following the instructions from https://developer.android.com/build/native-dependencies?agpversion=4.1#native-dependencies-aars
GodotVR · Jun 29, 2024 · c0650fe · c0650fe
1 parent dd7183c
commit c0650fe
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 44 deletions.
diff --git a/godotopenxrkhronos/CMakeLists.txt b/godotopenxrkhronos/CMakeLists.txt
@@ -7,12 +7,7 @@ project(godotopenxrvendors LANGUAGES CXX)
 include(${PROJECT_SOURCE_DIR}/../common/common.cmake)
 
 ## khronos OpenXR loader library
-set(KHRONOS_OPENXR_LIB_PATH "${PROJECT_SOURCE_DIR}/../thirdparty/khronos_openxr_sdk/${ANDROID_ABI}/libopenxr_loader.so")
-add_library(openxr_loader
-        SHARED
-        IMPORTED GLOBAL
-        )
-set_target_properties(openxr_loader PROPERTIES IMPORTED_LOCATION ${KHRONOS_OPENXR_LIB_PATH})
+find_package(OpenXR REQUIRED CONFIG)
 
 ## Setup the project sources
 file(GLOB_RECURSE ANDROID_SOURCES ${PROJECT_SOURCE_DIR}/src/main/cpp/*.c**)
@@ -37,7 +32,7 @@ target_link_libraries(${PROJECT_NAME}
         android
         log
         ${GODOT-CPP}
-        openxr_loader
+        OpenXR::openxr_loader
         )
 
 # Add the compile flags

diff --git a/godotopenxrkhronos/build.gradle b/godotopenxrkhronos/build.gradle
@@ -53,6 +53,7 @@ android {
     }
 
     buildFeatures {
+        prefab true
         prefabPublishing true
     }
 
@@ -65,6 +66,7 @@ android {
 
 dependencies {
     compileOnly libraries.godotAndroidLib
+    implementation "org.khronos.openxr:openxr_loader_for_android:1.0.34"
 }
 
 task cleanAssets(type: Delete) {

diff --git a/thirdparty/khronos_openxr_sdk/README.md b/thirdparty/khronos_openxr_sdk/README.md
diff --git a/thirdparty/khronos_openxr_sdk/arm64-v8a/abi.json b/thirdparty/khronos_openxr_sdk/arm64-v8a/abi.json
diff --git a/thirdparty/khronos_openxr_sdk/arm64-v8a/libopenxr_loader.so b/thirdparty/khronos_openxr_sdk/arm64-v8a/libopenxr_loader.so
diff --git a/thirdparty/khronos_openxr_sdk/x86_64/abi.json b/thirdparty/khronos_openxr_sdk/x86_64/abi.json
diff --git a/thirdparty/khronos_openxr_sdk/x86_64/libopenxr_loader.so b/thirdparty/khronos_openxr_sdk/x86_64/libopenxr_loader.so