diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt index 20690757a..1ef002f69 100644 --- a/renderdoc/CMakeLists.txt +++ b/renderdoc/CMakeLists.txt @@ -605,7 +605,11 @@ if(APPLE) endif() if(ANDROID) - set_target_properties(renderdoc PROPERTIES LINK_FLAGS "-Wl,--undefined,force_include_libentry -Wl,--build-id") + set(RDOC_LINK_FLAGS "-Wl,--undefined,force_include_libentry -Wl,--build-id") + if(ENABLE_ASAN) + set(RDOC_LINK_FLAGS "${RDOC_LINK_FLAGS} -fsanitize=address") + endif() + set_target_properties(renderdoc PROPERTIES LINK_FLAGS "${RDOC_LINK_FLAGS}") # rename output library set_target_properties(renderdoc PROPERTIES OUTPUT_NAME "VkLayer_GLES_RenderDoc") diff --git a/renderdoccmd/CMakeLists.txt b/renderdoccmd/CMakeLists.txt index 52454435d..fb1aff119 100644 --- a/renderdoccmd/CMakeLists.txt +++ b/renderdoccmd/CMakeLists.txt @@ -23,6 +23,10 @@ elseif(ANDROID) include_directories(${ANDROID_NDK_ROOT_PATH}/sources/android/native_app_glue) list(APPEND libraries PRIVATE -llog -landroid) set(LINKER_FLAGS "-Wl,--no-as-needed") + + if(ENABLE_ASAN) + set(LINKER_FLAGS "${LINKER_FLAGS} -fsanitize=address") + endif() set_source_files_properties(renderdoccmd.cpp PROPERTIES COMPILE_FLAGS "-fexceptions -frtti") set_source_files_properties(renderdoccmd_android.cpp PROPERTIES COMPILE_FLAGS "-fexceptions")