diff --git a/android/layer/CMakeLists.txt b/android/layer/CMakeLists.txt
index d944cf224..36b976fd5 100644
--- a/android/layer/CMakeLists.txt
+++ b/android/layer/CMakeLists.txt
@@ -3,10 +3,10 @@ cmake_minimum_required(VERSION 3.4.1)
 get_filename_component(GFXRECON_SOURCE_DIR ../.. ABSOLUTE)
 
 include(../framework/cmake-config/PlatformConfig.cmake)
-add_subdirectory(../framework/util ${CMAKE_SOURCE_DIR}/../framework/util/build/layer/${ANDROID_ABI})
-add_subdirectory(../framework/graphics ${CMAKE_SOURCE_DIR}/../framework/graphics/build/layer/${ANDROID_ABI})
-add_subdirectory(../framework/format ${CMAKE_SOURCE_DIR}/../framework/format/build/layer/${ANDROID_ABI})
-add_subdirectory(../framework/encode ${CMAKE_SOURCE_DIR}/../framework/encode/build/layer/${ANDROID_ABI})
+add_subdirectory(../framework/util ${CMAKE_SOURCE_DIR}/../framework/util/build/layer/${CMAKE_BUILD_TYPE}/${ANDROID_ABI})
+add_subdirectory(../framework/graphics ${CMAKE_SOURCE_DIR}/../framework/graphics/build/layer/${CMAKE_BUILD_TYPE}/${ANDROID_ABI})
+add_subdirectory(../framework/format ${CMAKE_SOURCE_DIR}/../framework/format/build/layer/${CMAKE_BUILD_TYPE}/${ANDROID_ABI})
+add_subdirectory(../framework/encode ${CMAKE_SOURCE_DIR}/../framework/encode/build/layer/${CMAKE_BUILD_TYPE}/${ANDROID_ABI})
 
 add_library(VkLayer_gfxreconstruct SHARED "")
 
diff --git a/android/tools/replay/CMakeLists.txt b/android/tools/replay/CMakeLists.txt
index e54888bd0..83b259eda 100644
--- a/android/tools/replay/CMakeLists.txt
+++ b/android/tools/replay/CMakeLists.txt
@@ -13,11 +13,11 @@ add_library(native_app_glue STATIC
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_onCreate")
 
 include(../../framework/cmake-config/PlatformConfig.cmake)
-add_subdirectory(../../framework/util ${CMAKE_SOURCE_DIR}/../../framework/util/build/tools/replay/${ANDROID_ABI})
-add_subdirectory(../../framework/graphics ${CMAKE_SOURCE_DIR}/../../framework/graphics/build/tools/replay/${ANDROID_ABI})
-add_subdirectory(../../framework/format ${CMAKE_SOURCE_DIR}/../../framework/format/build/tools/replay/${ANDROID_ABI})
-add_subdirectory(../../framework/decode ${CMAKE_SOURCE_DIR}/../../framework/decode/build/tools/replay/${ANDROID_ABI})
-add_subdirectory(../../framework/application ${CMAKE_SOURCE_DIR}/../../framework/application/build/tools/replay/${ANDROID_ABI})
+add_subdirectory(../../framework/util ${CMAKE_SOURCE_DIR}/../../framework/util/build/tools/replay/${CMAKE_BUILD_TYPE}/${ANDROID_ABI})
+add_subdirectory(../../framework/graphics ${CMAKE_SOURCE_DIR}/../../framework/graphics/build/tools/replay/${CMAKE_BUILD_TYPE}/${ANDROID_ABI})
+add_subdirectory(../../framework/format ${CMAKE_SOURCE_DIR}/../../framework/format/build/tools/replay/${CMAKE_BUILD_TYPE}/${ANDROID_ABI})
+add_subdirectory(../../framework/decode ${CMAKE_SOURCE_DIR}/../../framework/decode/build/tools/replay/${CMAKE_BUILD_TYPE}/${ANDROID_ABI})
+add_subdirectory(../../framework/application ${CMAKE_SOURCE_DIR}/../../framework/application/build/tools/replay/${CMAKE_BUILD_TYPE}/${ANDROID_ABI})
 
 add_library(gfxrecon-replay
             SHARED