commit a9a262541601fd08cc30a9a449dc7fba82303980
author Juan Ramos <juan@lunarg.com> Tue Jul 18 11:50:19 2023 -0600
committer arcady-lunarg <122813703+arcady-lunarg@users.noreply.github.com> Tue Jul 18 13:08:33 2023 -0600
tree c89d64e2618859cb59a35d296a225b9f645221c8
parent 9afd3461272fb318669774b2999d88c90cc9dabc

cmake: Fix Android build for r25 NDK

Currently with the build instructions provided in README.md
the build will fail.

In the r25 NDK the CMake toolchain defaults to the legacy path,
due to a bug in the current implementation.

https://github.com/android/ndk/issues/323

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89ecf64..d6613bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,7 +126,7 @@
         include(ChooseMSVCCRT.cmake)
     endif()
     add_definitions(-DGLSLANG_OSINCLUDE_WIN32)
-elseif(UNIX)
+elseif(UNIX OR ANDROID)
     add_definitions(-DGLSLANG_OSINCLUDE_UNIX)
 else()
     message("unknown platform")

glslang/CMakeLists.txt

diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
index 317eee7..f9ba5eb 100644
--- a/glslang/CMakeLists.txt
+++ b/glslang/CMakeLists.txt
@@ -33,7 +33,7 @@
 
 if(WIN32)
     add_subdirectory(OSDependent/Windows)
-elseif(UNIX OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia")
+elseif(UNIX OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia" OR ANDROID)
     add_subdirectory(OSDependent/Unix)
 else()
     message("unknown platform")