Skip to content

Commit

Permalink
Remove Khronos OpenXR patch
Browse files Browse the repository at this point in the history
We needed that patch because the upstream version was not properly
building with -Werror because there were some warnings in the
compilation. As we have upgraded the SDK to 1.0.31 we don't need
the patch anymore.
  • Loading branch information
svillar committed Oct 30, 2023
1 parent 92f3016 commit 3fff9c5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 14 deletions.
13 changes: 0 additions & 13 deletions app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -213,20 +213,7 @@ if (AOSP)
set(lib_build_DIR ${CMAKE_SOURCE_DIR}/../third_party/OpenXR-SDK/build)
file(MAKE_DIRECTORY ${lib_build_DIR})

# We use the ExternalProject utility just to patch OpenXR-SDK, we don't use it for anything else
# TODO: unapply the patch. As we don't use it for building we cannot currently use _Add_Step
# to specify a cleanup step depending on the build step.
include(ExternalProject)
ExternalProject_Add(EXTOpenXRLoader
SOURCE_DIR ${lib_src_DIR}
BINARY_DIR ${lib_build_DIR}
PATCH_COMMAND git reset --hard && git apply ${CMAKE_SOURCE_DIR}/../third_party/patches/0001-Fix-some-missing-field-initializer-warnings.patch
STEP_TARGETS patch
EXCLUDE_FROM_ALL TRUE
)

add_subdirectory(${lib_src_DIR} ${lib_build_DIR})
add_dependencies(openxr_loader EXTOpenXRLoader-patch)
target_link_libraries(native-lib openxr_loader)
endif()

Expand Down
2 changes: 1 addition & 1 deletion third_party_hash
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6bc41b7fef724f192856f6951578084cd36b1e27
6a75b7f13f23658b2ae09547bdf17ec51c5f996c

0 comments on commit 3fff9c5

Please sign in to comment.