diff --git a/scripts/gfxr_capture_replay_test.sh b/scripts/gfxr_capture_replay_test.sh
new file mode 100755
index 000000000..80af726b7
--- /dev/null
+++ b/scripts/gfxr_capture_replay_test.sh
@@ -0,0 +1,357 @@
+#!/bin/bash
+
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# TODO should script abort trigger cleanup? what about bugreport capture?
+
+set -eux
+
+print_usage() {
+    set +x
+    echo "End-to-end capture-replay test for package"
+    echo
+    echo "Usage: gfxr_capture_replay_test.sh [-hcdrsz] -p PACKAGE"
+    echo
+    echo "Required:"
+    echo " -p PACKAGE: The app package to test"
+    echo
+    echo "Optional:"
+    echo " -h: Print help"
+    echo " -c: Wait for debugger before capturing"
+    echo " -d: Use validation layers during capture"
+    echo " -r: Wait for debugger before replay"
+    echo " -s: Use validation layers during replay"
+    echo " -z: Package is a system app"
+    echo
+    echo "Example:"
+    echo " gfxr_capture_replay_test.sh -p com.google.bigwheels.project_cube_xr.debug"
+    set -x
+}
+
+CAPTURE_DEBUG=0
+REPLAY_DEBUG=0
+REPLAY_VALIDATION=0
+CAPTURE_VALIDATION=0
+SYSTEM_PACKAGE=0
+while getopts cdhp:rsz getopts_flag
+do
+    case "${getopts_flag}" in
+        c) CAPTURE_DEBUG=1;;
+        d) CAPTURE_VALIDATION=1;;
+        h)
+            print_usage
+            exit 0
+            ;;
+        p) PACKAGE="${OPTARG}";;
+        r) REPLAY_DEBUG=1;;
+        s) REPLAY_VALIDATION=1;;
+        z) SYSTEM_PACKAGE=1;;
+    esac
+done
+
+THIS_DIR=$(dirname "$0")
+. "${THIS_DIR}/test_automation/common.sh"
+
+ACTIVITY="$(find_default_activity "${PACKAGE}")"
+if [ -z "$ACTIVITY" -a ${SYSTEM_PACKAGE} -eq 0 ]
+then
+    echo "No default activity. Is this a system package? Try -z"
+    exit 1
+fi
+
+# Fairly reliable directory on remote device, as long as app has MANAGE_EXTERNAL_STORAGE permissions.
+# /data/local/tmp doesn't work on all devices tested.
+REMOTE_TEMP_DIR=/sdcard/Download
+GFXR_CAPTURE_DIR_BASENAME=gfxr_capture
+REPLAY_PACKAGE=com.lunarg.gfxreconstruct.replay
+GFXRECON=./third_party/gfxreconstruct/android/scripts/gfxrecon.py
+BUILD_DIR=./build
+GFXR_DUMP_RESOURCES="${BUILD_DIR}/gfxr_dump_resources/gfxr_dump_resources"
+JSON_BASENAME=dump.json
+DUMP_DIR="${REMOTE_TEMP_DIR}/dump"
+GFXR_BASENAME="${PACKAGE}_trim_trigger.gfxr"
+GFXA_BASENAME="${PACKAGE}_asset_file.gfxa"
+GFXR_REPLAY_APK=./install/gfxr-replay.apk
+RESULTS_DIR="${PACKAGE}-$(date +%Y%m%d_%H%M%S)"
+JSON="${RESULTS_DIR}/${JSON_BASENAME}"
+LOCAL_TEMP_DIR=/tmp
+ARCHIVE_BASENAME=android-binaries-1.4.313.0
+ARCHIVE_FILE=android-binaries-1.4.313.0.tar.gz
+VALIDATION_LAYER_DIR=${LOCAL_TEMP_DIR}/${ARCHIVE_BASENAME}
+VALIDATION_LAYER_LIB=libVkLayer_khronos_validation.so
+REMOTE_TEMP_FILEPATH="/data/local/tmp/${VALIDATION_LAYER_LIB}"
+ARCH=$(adb shell getprop ro.product.cpu.abi)
+LOCAL_VALIDATION_LAYER_FILEPATH="${VALIDATION_LAYER_DIR}/${ARCH}/${VALIDATION_LAYER_LIB}"
+
+#
+# Clear anything previously set (in case the script exited prematurely)
+#
+
+unset_gfxr_props
+unset_vulkan_debug_settings
+
+#
+# Ask OpenXR runtime to emit frame debug marker
+#
+
+adb shell setprop debug.openxr.enable_frame_delimiter true
+
+#
+# Download validation layers
+#
+
+if [ ${REPLAY_VALIDATION} -eq 1 -o ${CAPTURE_VALIDATION} -eq 1 ]
+then
+    # Download the archive and cache the result
+    if [ ! -f "${LOCAL_TEMP_DIR}/${ARCHIVE_FILE}" ]; then
+        $(cd "${LOCAL_TEMP_DIR}" && wget https://github.com/KhronosGroup/Vulkan-ValidationLayers/releases/download/vulkan-sdk-1.4.313.0/android-binaries-1.4.313.0.tar.gz)
+    fi
+    # Extract the archive and cache the result
+    if [ ! -e "${LOCAL_VALIDATION_LAYER_FILEPATH}" ]; then
+        $(cd "${LOCAL_TEMP_DIR}" && tar xf "${ARCHIVE_FILE}")
+    fi
+fi
+
+mkdir -p "${RESULTS_DIR}"
+
+#
+# 1. Install replay package for both capture layer and replay activity
+#
+
+# Check if we need to reinstall the replay APK. First, is it installed.
+# TODO would be nice if we could isolate this into a function
+install_replay_apk=0
+if is_app_installed "${REPLAY_PACKAGE}"
+then
+    REMOTE_REPLAY_APK_FILEPATH="$(get_app_path "${REPLAY_PACKAGE}")"
+    # Second, do the files match.
+    REMOTE_APK_SHA=$(adb shell sha256sum -b "${REMOTE_REPLAY_APK_FILEPATH}")
+    LOCAL_APK_SHA=$(sha256sum "${GFXR_REPLAY_APK}" | awk '{ print $1 }')
+    if [ "${REMOTE_APK_SHA}" != "${LOCAL_APK_SHA}" ]
+    then
+        adb uninstall "${REPLAY_PACKAGE}"
+        install_replay_apk=1
+    fi
+else
+    install_replay_apk=1
+fi
+
+if [ $install_replay_apk -eq 1 ]
+then
+    python "${GFXRECON}" install-apk "${GFXR_REPLAY_APK}"
+fi
+
+# Replay with --dump-resources needs permissions to store generated BMPs
+# Always do this since this permission resets on reboot or stop/start if not explicitly granted
+adb shell appops set "${REPLAY_PACKAGE}" MANAGE_EXTERNAL_STORAGE allow
+
+# Install the validation layer into the replay app so we can easily find it in both capture and replay
+if [ ${REPLAY_VALIDATION} -eq 1 -o ${CAPTURE_VALIDATION} -eq 1 ]
+then
+    # run-as is probably fine since we control the replay app is built
+    adb push "${LOCAL_VALIDATION_LAYER_FILEPATH}" "${REMOTE_TEMP_FILEPATH}"
+    # Can't mv since REMOTE_TEMP_FILEPATH is owned by shell or root
+    adb shell run-as "${REPLAY_PACKAGE}" cp "${REMOTE_TEMP_FILEPATH}" .
+    adb shell rm -rf "${REMOTE_TEMP_FILEPATH}"
+fi
+
+# TODO copy replay APK into RESULTS_DIR?
+
+#
+# 2. Configure PACKAGE to use capture layer from replay package
+#
+
+CAPTURE_LAYERS="VK_LAYER_LUNARG_gfxreconstruct"
+CAPTURE_DEBUG_LAYER_APPS="${REPLAY_PACKAGE}"
+if [ ${CAPTURE_VALIDATION} -eq 1 ]
+then
+    # Put validation layer last otherwise we try to capture bogus objects. Also replay fails otherwise.
+    CAPTURE_LAYERS="${CAPTURE_LAYERS}:VK_LAYER_KHRONOS_validation"
+    CAPTURE_DEBUG_LAYER_APPS="${PACKAGE}:${CAPTURE_DEBUG_LAYER_APPS}"
+
+    # TODO need to use run-as until the validation layers are packed into the replay APK
+    adb push "${LOCAL_VALIDATION_LAYER_FILEPATH}" "${REMOTE_TEMP_FILEPATH}"
+    # Can't mv since REMOTE_TEMP_FILEPATH is owned by shell or root
+    adb shell run-as "${PACKAGE}" cp "${REMOTE_TEMP_FILEPATH}" .
+    adb shell rm -rf "${REMOTE_TEMP_FILEPATH}"
+fi
+
+# Adapted from https://developer.android.com/ndk/guides/graphics/validation-layer.
+adb shell settings put global enable_gpu_debug_layers 1
+adb shell settings put global gpu_debug_app "${PACKAGE}"
+adb shell settings put global gpu_debug_layers "${CAPTURE_LAYERS}"
+# Both the capture and validation layers are in the replay APK since it's an easy place to put them.
+adb shell settings put global gpu_debug_layer_app "${CAPTURE_DEBUG_LAYER_APPS}"
+
+#
+# 3. Configure GFXR behavior
+#
+
+# See //third_party/gfxreconstruct/USAGE_android.md for more options.
+adb shell mkdir -p "${REMOTE_TEMP_DIR}"
+adb shell setprop debug.gfxrecon.capture_file "${REMOTE_TEMP_DIR}/${PACKAGE}.gfxr"
+# Use trigger trim with asset file since it's what Dive prefers
+adb shell setprop debug.gfxrecon.capture_trigger_frames 1
+adb shell setprop debug.gfxrecon.capture_android_trigger false
+adb shell setprop debug.gfxrecon.capture_use_asset_file true
+# Remove timestamp from capture filename so it's more predictable.
+# Since we copy into a timestamped results folder, we don't end up overwriting pulled results.
+adb shell setprop debug.gfxrecon.capture_file_timestamp false
+# Since we focused on "does this work?" the extra logging helps
+adb shell setprop debug.gfxrecon.log_level debug
+# Capture layer in PACKAGE needs permissions to read capture/asset file from storage.
+adb shell appops set "${PACKAGE}" MANAGE_EXTERNAL_STORAGE allow
+
+#
+# 4. Capture
+#
+
+# Clear logcat so that we can use it to determine when capture is done based on logging.
+adb logcat -c
+
+if [ ${CAPTURE_DEBUG} -eq 1 ]
+then
+    adb shell am set-debug-app -w "${PACKAGE}"
+fi
+
+# Start app, wait for it to start
+if [ ${SYSTEM_PACKAGE} -eq 1 ]
+then
+    adb root
+    adb shell stop
+    adb shell start
+else
+    adb shell am start -S -W -n "${PACKAGE}/${ACTIVITY}"
+fi
+
+# Given how long it takes to attach the debugger, etc, it is unlikely that you'll want the script to proceed.
+if [ ${CAPTURE_DEBUG} -eq 1 ]
+then
+    exit 0
+fi
+
+# Likely redundant, but wait for the capture layer to log that it's been loaded
+if ! wait_for_logcat_line gfxrecon "Initializing GFXReconstruct capture layer"
+then
+    adb bugreport
+fi
+
+# Trigger a capture after the app has enough time to load.
+# Use this over the capture_frame setting since Dive doesn't use capture_frame.
+# Unfortunately "the app is loaded" is not something we can determine so we need to sleep... This is where capture_frame could really help.
+# 20s is too short for some large Unity apps.
+sleep 30
+adb shell setprop debug.gfxrecon.capture_android_trigger true
+
+# Wait for capture to finish. Luckily, the app logs when it's done so use that as the signal to proceed.
+# This only works since we clear the logcat at the start of the test.
+# We prefer this over quit_after_capture_frames since that setting seems broken.
+if ! wait_for_logcat_line gfxrecon "Finished recording graphics API capture"
+then
+    adb bugreport
+fi
+adb shell am force-stop "${PACKAGE}"
+
+# Pull the GFXR/GFXA for gfxr_dump_resources
+adb pull "${REMOTE_TEMP_DIR}/${GFXR_BASENAME}" "${RESULTS_DIR}"
+adb pull "${REMOTE_TEMP_DIR}/${GFXA_BASENAME}" "${RESULTS_DIR}"
+
+#
+# 5. Post-capture clean-up
+#
+
+# NOTE: Don't clean up GFXA/GFXR since we can use it for replay. Saves having to push again.
+
+# Next launch of PACKAGE/ACTIVITY should not use GFXR
+unset_gfxr_props
+unset_vulkan_debug_settings
+
+#
+# 6. Replay with dump-resources
+#
+
+# --last-draw-only saves time by only dumping the final draw call. This should represent what the user sees.
+"${GFXR_DUMP_RESOURCES}" --last_draw_only "${RESULTS_DIR}/${GFXR_BASENAME}" "${JSON}"
+adb shell mkdir -p "${DUMP_DIR}"
+adb push "${JSON}" "${REMOTE_TEMP_DIR}"
+
+if [ ${REPLAY_VALIDATION} -eq 1 ]
+then
+    adb shell settings put global enable_gpu_debug_layers 1
+    adb shell settings put global gpu_debug_app "${REPLAY_PACKAGE}"
+    adb shell settings put global gpu_debug_layers VK_LAYER_KHRONOS_validation
+    adb shell settings put global gpu_debug_layer_app "${REPLAY_PACKAGE}"
+fi
+
+if [ ${REPLAY_DEBUG} -eq 1 ]
+then
+    adb shell am set-debug-app -w "${REPLAY_PACKAGE}"
+fi
+
+python "${GFXRECON}" replay \
+    --dump-resources "${REMOTE_TEMP_DIR}/${JSON_BASENAME}" \
+    --dump-resources-dir "${DUMP_DIR}" \
+    --dump-resources-dump-all-image-subresources \
+    --log-level debug \
+    "${REMOTE_TEMP_DIR}/${GFXR_BASENAME}"
+
+# `gfxrecon.py replay` does not wait for the app to start so. However, if it starts logging then we can assume that it has started.
+# This only works since we clear the logcat at the start of the test.
+if ! wait_for_logcat_line gfxrecon "Loading state for captured frame"
+then
+    adb bugreport
+fi
+# We can infer that replay is finished when the replay app process is gone.
+while adb shell pidof "${REPLAY_PACKAGE}"
+do
+    sleep 1
+done
+if is_crash_detected
+then
+    adb bugreport
+fi
+
+# Pull the entire dump dir since it has both a meta JSON file along with the BMP of the final image.
+adb pull "${DUMP_DIR}" "${RESULTS_DIR}"
+
+#
+# 7. Post-replay cleanup
+#
+
+adb shell rm -rf "${DUMP_DIR}"
+adb shell rm -rf "${REMOTE_TEMP_DIR}/${GFXR_BASENAME}"
+adb shell rm -rf "${REMOTE_TEMP_DIR}/${GFXA_BASENAME}"
+adb shell rm -rf "${REMOTE_TEMP_DIR}/${JSON_BASENAME}"
+
+# Next launch should not use GFXR. Likely redudant but doesn't hurt.
+unset_gfxr_props
+unset_vulkan_debug_settings
+
+#
+# 8. Collect results
+#
+
+# Show logcat to the user for diagnostic purposes. Include DEBUG in case there was a crash.
+adb logcat -d -s gfxrecon,DEBUG
+
+# Convert BMP captures into JPG for convenience.
+find "${RESULTS_DIR}" -name "*.bmp" | xargs -P0 -I {} convert {} {}.jpg
+
+# Compress files to make them easier to share.
+tar czf "${RESULTS_DIR}.tgz" "${RESULTS_DIR}"
+
+set +x
+echo "------------------------------------------"
+echo "Results written to: ${RESULTS_DIR}.tgz"
diff --git a/scripts/replay-with-dump.sh b/scripts/replay-with-dump.sh
index d29aaf800..1fe844d11 100755
--- a/scripts/replay-with-dump.sh
+++ b/scripts/replay-with-dump.sh
@@ -60,6 +60,7 @@ fi
 python "$GFXRECON" replay \
     --dump-resources "$PUSH_DIR/$JSON_BASENAME" \
     --dump-resources-dir "$DUMP_DIR" \
+    --log-level debug \
     "$PUSH_DIR/$GFXR_BASENAME"
 
 # gfxrecon.py replay does not wait for the app to start so.
diff --git a/scripts/test_automation/common.sh b/scripts/test_automation/common.sh
new file mode 100644
index 000000000..a1d5bab40
--- /dev/null
+++ b/scripts/test_automation/common.sh
@@ -0,0 +1,114 @@
+#!/bin/bash
+
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Common functionality for building testing scripts
+
+# The next app launch should use the default GFXR settings
+unset_gfxr_props() {
+    adb shell setprop debug.gfxrecon.capture_file '""'
+    adb shell setprop debug.gfxrecon.capture_trigger_frames '""'
+    adb shell setprop debug.gfxrecon.capture_android_trigger '""'
+    adb shell setprop debug.gfxrecon.capture_use_asset_file '""'
+    adb shell setprop debug.gfxrecon.quit_after_capture_frames '""'
+    adb shell setprop debug.gfxrecon.capture_file_timestamp '""'
+    adb shell setprop debug.gfxrecon.capture_frames '""'
+    adb shell setprop debug.gfxrecon.log_level '""'
+    adb shell setprop debug.gfxrecon.capture_file_flush '""'
+}
+
+# The next app launch should not use debug layers
+unset_vulkan_debug_settings() {
+    adb shell settings delete global enable_gpu_debug_layers
+    adb shell settings delete global gpu_debug_app
+    adb shell settings delete global gpu_debug_layers
+    adb shell settings delete global gpu_debug_layer_app
+}
+
+# Check if the logcat contains a string. Returns 0 on successful find, 1 otherwise
+# Usage: logcat_has_line TAG LINE
+# Example: if logcat_has_line gfxrecon "Finished recording graphics API capture"; then echo done capturing; fi
+logcat_has_line() {
+    test $(adb logcat -s "$1" -e "$2" -d | wc -l) -gt 0
+}
+
+# Check if something crashed. Returns 0 if something crashed, 1 otherwise
+# Usage: is_crash_detected
+# Example: if is_crash_detected; then adb bugreport; fi
+is_crash_detected() {
+    logcat_has_line "DEBUG" "\*\*\* \*\*\* \*\*\*"
+}
+
+# Block execution until a specific line is printed to logcat from an app with a given tag, or a 20s timeout is reached.
+# If the line was found, returns 0. Otherwise, if the timeout was reached, returns 1.
+# Usage: wait_for_logcat_line TAG LINE
+# Example: wait_for_logcat_line gfxrecon "Finished recording graphics API capture"
+wait_for_logcat_line() {
+    # Could use adb logcat -s "$1" -e "$2" --print but this blocks without timeout. Poll instead.
+    # 30s should be long enough for the app to start and produce a capture. If not then something is likely wrong. 20s was too short if you wanted to capture with debugging.
+    for i in {1..30}
+    do
+        sleep 1
+        if logcat_has_line "$1" "$2"
+        then
+            return 0
+        fi
+    done
+    return 1
+}
+
+# Get the main activity from a package, if it exists
+# Usage: find_default_activity PACKAGE
+# Example: ACTIVITY=$(find_default_activity com.google.bigwheels.project_xube_xr.debug) # ACTIVITY should be com.google.bigwheels.MainActivity
+# TODO: If "No activity found", exit status should be > 0
+find_default_activity() {
+    adb shell cmd package resolve-activity "$1" | grep "name=" | head -n1 | sed 's/.*name=//'
+}
+
+# Exit status is 0 if an app is installed, otherwise non-0
+# Usage: is_app_installed PACKAGE
+# Example: if is_app_installed com.lunarg.gfxreconstruct.replay; then echo app is installed; fi
+is_app_installed() {
+    adb shell pm path "$1" 2>&1 /dev/null
+}
+
+# If the app is installed, return the path to the APK on the device
+# Usage: get_app_path PACKAGE
+# Example: REMOTE_APK_PATH=$(get_app_path com.lunarg.gfxreconstruct.replay) # REMOTE_APK_PATH should be similar to /data/app/~~mijWjamWRSB7_rLBy-xQsA==/com.lunarg.gfxreconstruct.replay-K6xMsr7YlvENFRXe82FdRQ==/base.apk
+get_app_path() {
+    adb shell pm path "$1" | sed 's/package://'
+}
+
+# Get the package name from the APK.
+# NOTE: build-tools must be in your PATH
+# Usage: get_apk_package_name MY_APP.APK
+# Example: PACKAGE=$(get_apk_package_name ./install/gfxr-replay.apk) # PACKAGE should be com.lunarg.gfxreconstruct.replay
+# get_apk_package_name() {
+#     # TODO if we don't want build-tools dep, we could just ask the user for the name
+#     aapt2 dump badging "$1" | grep "package:" | grep -oE " name='[^']*'"| sed -E "s/ name='([^']*)'/\1/"
+# }
+
+# If the local replay APK differs from the device, install it
+# Usage: install_if_different APK
+# Example: install_if_different ./install/gfxr-replay.apk
+# install_replay_if_different() {
+#     apk_file="$1"
+#     # This is replay-specific so hard-code
+#     package="com.lunarg.gfxreconstruct.replay"
+#     if is_app_installed "${package}"
+#     then
+
+#     fi
+# }
\ No newline at end of file