Remove Android-specific build files#2989
Open
MarkY-LunarG wants to merge 3 commits into
Open
Conversation
MarkY-LunarG
requested review from
antonio-lunarg,
fabian-lunarg,
mikes-lunarg and
ziga-lunarg
charles-lunarg
left a comment
charles-lunarg
left a comment
Contributor
There was a problem hiding this comment.
One question about putting build files in the source tree, and a comment about replacing GFXRECON_SOURCE_DIR with PROJECT_SOURCE_DIR.
bradgrantham-lunarg
added
the
approved-to-run-ci
Merge Android and desktop build files where possible.
MarkY-LunarG
force-pushed
the
marky-merge-android-build-files
branch
from
1fb116e to
7ec3c20
Compare
antonio-lunarg
approved these changes
Jun 10, 2026
| message(STATUS "OpenXR support disabled!") | ||
| endif() | ||
|
|
||
| add_subdirectory(../framework/util ${PROJECT_SOURCE_DIR}/../framework/util/build/layer/${ANDROID_ABI}) |
Contributor
There was a problem hiding this comment.
Need to delete android/framework/decode and android/framework/util directories?
| $<$<BOOL:${X11_FOUND}>:${CMAKE_CURRENT_LIST_DIR}/xlib_loader.cpp> | ||
| $<$<BOOL:${WAYLAND_FOUND}>:${CMAKE_CURRENT_LIST_DIR}/wayland_loader.h> | ||
| $<$<BOOL:${WAYLAND_FOUND}>:${CMAKE_CURRENT_LIST_DIR}/wayland_loader.cpp> | ||
| $<$<BOOL:${WAYLAND_FOUND}>:${PROJECT_SOURCE_DIR}/framework/generated/generated_wayland_xdg_shell.h> |
Contributor
There was a problem hiding this comment.
PROJECT_SOURCE_DIR->GFXRECON_SOURCE_DIR
Contributor
|
Tested the change internally and it works for us (@per-mathisen-arm) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge Android and desktop build files where possible.