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

Update cmake strip scripts on android to work with latest NDK

Browse Source
This commit is contained in:
baldurk
2021-03-26 12:00:53 +00:00
parent 65e0028f64
commit 72095ff35c
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+9
View File
@@ -313,6 +313,15 @@ if(cmake_build_type_lower STREQUAL "release" OR
set(RELEASE_MODE 1)
endif()
if(STRIP_ANDROID_LIBRARY AND BUILD_ANDROID AND RELEASE_MODE)
set(ANDROID_STRIP_TOOL "${ANDROID_TOOLCHAIN_ROOT}/bin/llvm-strip${ANDROID_TOOLCHAIN_SUFFIX}")
if(NOT EXISTS "${ANDROID_STRIP_TOOL}")
set(ANDROID_STRIP_TOOL "${CMAKE_STRIP}")
endif()
message(STATUS "libraries will be stripped with ${ANDROID_STRIP_TOOL}")
endif()
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
renderdoc/CMakeLists.txt
+2 -3
View File
@@ -607,12 +607,11 @@ if(ANDROID)
# rename output library
set_target_properties(renderdoc PROPERTIES OUTPUT_NAME "VkLayer_GLES_RenderDoc")
if(STRIP_ANDROID_LIBRARY AND CMAKE_STRIP AND RELEASE_MODE)
message(STATUS "renderdoc library will be stripped")
if(STRIP_ANDROID_LIBRARY AND ANDROID_STRIP_TOOL AND RELEASE_MODE)
add_custom_command(TARGET renderdoc POST_BUILD
COMMAND echo Stripping $<TARGET_FILE:renderdoc>
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:renderdoc> $<TARGET_FILE:renderdoc>.dbg
COMMAND ${CMAKE_STRIP} --strip-unneeded $<TARGET_FILE:renderdoc>)
COMMAND ${ANDROID_STRIP_TOOL} --strip-unneeded $<TARGET_FILE:renderdoc>)
endif()
endif()
renderdoccmd/CMakeLists.txt
+2 -3
View File
@@ -85,12 +85,11 @@ if(ANDROID)
endif()
message(STATUS "Using Java of version ${Java_VERSION}")
if(STRIP_ANDROID_LIBRARY AND CMAKE_STRIP AND RELEASE_MODE)
message(STATUS "renderdoccmd library will be stripped")
if(STRIP_ANDROID_LIBRARY AND ANDROID_STRIP_TOOL AND RELEASE_MODE)
add_custom_command(TARGET renderdoccmd POST_BUILD
COMMAND echo Stripping $<TARGET_FILE:renderdoccmd>
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:renderdoccmd> $<TARGET_FILE:renderdoccmd>.dbg
COMMAND ${CMAKE_STRIP} --strip-unneeded $<TARGET_FILE:renderdoccmd>)
COMMAND ${ANDROID_STRIP_TOOL} --strip-unneeded $<TARGET_FILE:renderdoccmd>)
endif()
set(ANDROID_BUILD_TOOLS_VERSION "" CACHE STRING "Version of Android build-tools to use instead of the default")