From 7e976c04a8de0e222ca5832012bef7b527bfdc98 Mon Sep 17 00:00:00 2001 From: Jacob Thomas Date: Thu, 11 Apr 2024 21:29:35 -0400 Subject: [PATCH] Fix 'android-.jar' search path on MacOS The renderdoccmd android build assumes all files in '${ANDROID_SDK_ROOT_PATH}/platforms' are valid 'android-.jar' platform libraries. Unfortunately because MacOS litters its directories with metadata files called .DS_Store, that file actually wins this sorting logic and is incorrectly selected. This fixes the lib search logic to only consider android libraries. --- renderdoccmd/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renderdoccmd/CMakeLists.txt b/renderdoccmd/CMakeLists.txt index 918a33618..16f5d4ab7 100644 --- a/renderdoccmd/CMakeLists.txt +++ b/renderdoccmd/CMakeLists.txt @@ -152,7 +152,7 @@ if(ANDROID) if(APK_TARGET_ID STREQUAL "") # This seems different from the platform we're targetting, # default to the latest available that's greater or equal to our target platform - file(GLOB __platforms RELATIVE "${ANDROID_SDK_ROOT_PATH}/platforms" "${ANDROID_SDK_ROOT_PATH}/platforms/*") + file(GLOB __platforms RELATIVE "${ANDROID_SDK_ROOT_PATH}/platforms" "${ANDROID_SDK_ROOT_PATH}/platforms/android-*") list(SORT __platforms) # In case we don't find one, target the latest platform