lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 09:00:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

add explicit folder name to d8 commandline

Browse Source 
d8 on cmd/powershell doesn't handle asterisks properly for folders, so replacing it by current ABI folder name
This commit is contained in:
Remi Palandri
2021-10-07 17:59:53 -07:00
committed by Baldur Karlsson
parent 501b67bccf
commit 0151c5ce88
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoccmd/CMakeLists.txt
+7 -5
View File
@@ -180,17 +180,19 @@ if(ANDROID)
# Set the package name based on the ABI
if(ANDROID_ABI STREQUAL "armeabi-v7a")
set(RENDERDOC_ANDROID_PACKAGE_NAME "org.renderdoc.renderdoccmd.arm32")
set(ABI_EXTENSION_NAME "arm32")
elseif(ANDROID_ABI STREQUAL "arm64-v8a")
set(RENDERDOC_ANDROID_PACKAGE_NAME "org.renderdoc.renderdoccmd.arm64")
set(ABI_EXTENSION_NAME "arm64")
elseif(ANDROID_ABI STREQUAL "x86")
set(RENDERDOC_ANDROID_PACKAGE_NAME "org.renderdoc.renderdoccmd.x86")
set(ABI_EXTENSION_NAME "x86")
elseif(ANDROID_ABI STREQUAL "x86_64")
set(RENDERDOC_ANDROID_PACKAGE_NAME "org.renderdoc.renderdoccmd.x64")
set(ABI_EXTENSION_NAME "x64")
else()
message(FATAL_ERROR "ABI ${ANDROID_ABI} is not supported.")
endif()
set(RENDERDOC_ANDROID_PACKAGE_NAME "org.renderdoc.renderdoccmd.${ABI_EXTENSION_NAME}")
set(APK_FILE ${CMAKE_BINARY_DIR}/bin/${RENDERDOC_ANDROID_PACKAGE_NAME}.apk)
add_custom_target(apk ALL
DEPENDS ${APK_FILE})
@@ -250,7 +252,7 @@ if(ANDROID)
if(NOT EXISTS ${D8_SCRIPT})
set(DEX_COMMAND ${BUILD_TOOLS}/dx${TOOL_SCRIPT_EXTENSION} --dex --output=bin/classes.dex ./obj)
else()
set(DEX_COMMAND ${D8_SCRIPT} --output ./bin/ ./obj/org/renderdoc/renderdoccmd/*/*.class)
set(DEX_COMMAND ${D8_SCRIPT} --output ./bin/ ./obj/org/renderdoc/renderdoccmd/${ABI_EXTENSION_NAME}/*.class)
endif()
add_custom_command(OUTPUT ${APK_FILE} APPEND