diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2694f8e5e..12f85e9b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -115,7 +115,7 @@ else()
         set(DIVE_GFXR_GRADLE_CONSOLE "verbose" CACHE LIST "Value of --console to use when building GFXR with Gradle")
         message(CHECK_START "Build gfxr for android")
         execute_process(
-            COMMAND ./gradlew assemble${CMAKE_BUILD_TYPE} --console=${DIVE_GFXR_GRADLE_CONSOLE} -P${ANDROID_ABI}
+            COMMAND ./gradlew layer:assemble${CMAKE_BUILD_TYPE} replay:assemble${CMAKE_BUILD_TYPE} --console=${DIVE_GFXR_GRADLE_CONSOLE} -P${ANDROID_ABI}
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/third_party/gfxreconstruct/android
             COMMAND_ERROR_IS_FATAL ANY
         )
diff --git a/scripts/build_android.bat b/scripts/build_android.bat
index d50fee070..1092b2ca7 100644
--- a/scripts/build_android.bat
+++ b/scripts/build_android.bat
@@ -66,7 +66,7 @@ pushd !GFXR_ROOT_DIR!
     set build=%%b
     
     echo GFXR_ROOT_DIR: !GFXR_ROOT_DIR!
-    call gradlew assemble!build! --console=verbose -Parm64-v8a
+    call gradlew layer:assemble!build! replay:assemble!build! --console=verbose -Parm64-v8a
 ))
 popd