Merge ~mitchellaugustin/ubuntu/+source/gfxreconstruct:ubuntu/resolute-new into ubuntu/+source/gfxreconstruct:debian/sid

[Mitchell Augustin]

New upstream release

[Mitchell Augustin (mitchellaugustin)]

I've tagged ubuntu-sponsors here, but I'm not entirely sure how to proceed here since this git history is in a bit of a weird state. Basically, this package was removed from Debian, and is now in the process of being re-introduced.

The branch that I have linked in my linked bug report description contains some Ubuntu-specific modifications (to accommodate our separate spirv-reflect, which is still in the debian NEW queue). Additionally, development in Debian is now happening via this branch: https://salsa.debian.org/xorg-team/vulkan/gfxreconstruct, whose history is not the same as ours in Ubuntu.

This MP is based on that Debian branch since it is the most up-to-date. If it is permissible to just reset our ubuntu/resolute branch to the one I'm proposing, that may be most appropriate here (since we don't currently have any gfxreconstruct in resolute due to its debian removal: https://launchpad.net/ubuntu/+source/gfxreconstruct), but let me know what you think.

Unmerged commits

d743295... by Mitchell Augustin on 2026-01-28

Bump dependency version to 335

611ca62... by Mitchell Augustin on 2026-01-28

Update changelog

5fdaea1... by Mitchell Augustin on 2026-01-28

Merge branch 'upstream' into ubuntu/resolute

a7167a5... by Mitchell Augustin on 2026-01-28

New upstream version 1.4.335.0+dfsg

bfc4e01... by Mitchell Augustin on 2026-01-28

Fix debian/watch

4bdc42a... by Mitchell Augustin on 2026-01-27

s/spirv-reflect-dev/libspirv-reflect-dev

10b5e64... by Mitchell Augustin on 2026-01-27

Target resolute

4912c0e... by Mitchell Augustin on 2025-11-26

Update d/changelog and d/control

e163e07... by Mitchell Augustin on 2025-11-25

Remove spirv-reflect-shared

8b533fb... by Mitchell Augustin on 2025-11-25

Fix spirv-reflect dependency build/link issues and openxr dependency versioning

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000..1251040
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @LunarG/gfxreconstruct-architecture-reviewers
diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml
index 31a3e32..bdd6cd8 100644
--- a/.github/workflows/ci_build.yml
+++ b/.github/workflows/ci_build.yml
@@ -15,24 +15,41 @@ jobs:
       fail-fast: false
       matrix:
         config:
+<<<<<<< .github/workflows/ci_build.yml
         - {
             name: "Ubuntu GCC Release",
             os: ubuntu-latest,
             artifact: "gfxreconstruct-dev-ubuntu-gcc-release",
+=======
+          - {
+            name: "Ubuntu GCC Release",
+            os: ubuntu-latest,
+            artifact: "gfxreconstruct-dev-ubuntu-gcc-release",
+            test_failure_artifact: "gfxreconstruct-dev-test-failure-ubuntu-gcc-release",
+>>>>>>> .github/workflows/ci_build.yml
             type: "release",
             build_dir: "build",
             cc: "gcc", cxx: "g++"
           }
+<<<<<<< .github/workflows/ci_build.yml
         - {
             name: "Ubuntu GCC Debug",
             os: ubuntu-latest,
             artifact: "gfxreconstruct-dev-ubuntu-gcc-debug",
+=======
+          - {
+            name: "Ubuntu GCC Debug",
+            os: ubuntu-latest,
+            artifact: "gfxreconstruct-dev-ubuntu-gcc-debug",
+            test_failure_artifact: "gfxreconstruct-dev-test-failure-ubuntu-gcc-debug",
+>>>>>>> .github/workflows/ci_build.yml
             type: "debug",
             build_dir: "dbuild",
             cc: "gcc", cxx: "g++"
           }
     steps:
     - name: Clone repository
+<<<<<<< .github/workflows/ci_build.yml
       uses: actions/checkout@v1
     - name: Install build dependencies
       run: |
@@ -41,10 +58,25 @@ jobs:
     - uses: lukka/get-cmake@latest
       with:
         cmakeVersion: 3.16.3
+=======
+      uses: actions/checkout@v4
+      with:
+        submodules: 'recursive'
+    - name: Setup sccache
+      uses: mozilla-actions/sccache-action@v0.0.9
+    - name: Install build dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y libx11-xcb-dev libxcb-keysyms1-dev libwayland-dev libxrandr-dev liblz4-dev libzstd-dev clang-format-14
+    - uses: lukka/get-cmake@latest
+      with:
+        cmakeVersion: 3.24
+>>>>>>> .github/workflows/ci_build.yml
     - name: Run build script
       run: |
         if [ "${{ matrix.config.type }}" == "release" ]
         then
+<<<<<<< .github/workflows/ci_build.yml
           clang-format --version # A check for version 9 should be added.
           git fetch origin ${{ github.base_ref }} # Fetch target branch to FETCH_HEAD for code style check.
           python3 scripts/build.py --skip-tests --config ${{ matrix.config.type }} --check-code-style-base FETCH_HEAD --parallel 0
@@ -53,6 +85,32 @@ jobs:
         else
           python3 scripts/build.py --skip-tests --config ${{ matrix.config.type }} --skip-check-code-style --parallel 0
         fi
+=======
+          clang-format-14 --version
+          git fetch origin ${{ github.base_ref }} # Fetch target branch to FETCH_HEAD for code style check.
+          python3 scripts/build.py --config ${{ matrix.config.type }} --check-code-style-base FETCH_HEAD --parallel 0 --test-apps
+          python3 framework/generated/generate_vulkan.py # check generated code isn't out of date
+          python3 framework/generated/generate_openxr.py # check generated code isn't out of date
+          git diff --exit-code
+        else
+          python3 scripts/build.py --config ${{ matrix.config.type }} --skip-check-code-style --parallel 0 --test-apps
+        fi
+      env:
+        SCCACHE_GHA_ENABLED: on
+        CMAKE_C_COMPILER_LAUNCHER: sccache
+        CMAKE_CXX_COMPILER_LAUNCHER: sccache
+    - name: Run test app test cases
+      id: test_apps
+      run: |
+        cd ${{matrix.config.build_dir}}/linux/x64/output/test
+        sudo -n ./run-tests.sh
+    - name: Upload test failure artifacts
+      uses: actions/upload-artifact@v4
+      if: ${{ failure() && steps.test_apps.conclusion == 'failure' }}
+      with:
+        name: ${{ matrix.config.test_failure_artifact }}
+        path: ${{matrix.config.build_dir}}/linux/x64/output/test
+>>>>>>> .github/workflows/ci_build.yml
     - name: Prepare artifacts
       run: |
         cp LICENSE.txt ${{ matrix.config.build_dir }}/linux/x64/output/bin/
@@ -63,7 +121,11 @@ jobs:
         mv ${{ matrix.config.build_dir }}/linux/x64/output/lib*/*.so gfxreconstruct-dev/
         mv ${{ matrix.config.build_dir }}/linux/x64/output/share/vulkan/explicit_layer.d/*.json gfxreconstruct-dev/
     - name: Upload artifacts
+<<<<<<< .github/workflows/ci_build.yml
       uses: actions/upload-artifact@v1
+=======
+      uses: actions/upload-artifact@v4
+>>>>>>> .github/workflows/ci_build.yml
       with:
         name: ${{ matrix.config.artifact }}
         path: ./gfxreconstruct-dev
@@ -75,28 +137,87 @@ jobs:
       fail-fast: false
       matrix:
         config:
+<<<<<<< .github/workflows/ci_build.yml
         - {
             name: "Windows MSVC Release",
             os: windows-latest,
             artifact: "gfxreconstruct-dev-windows-msvc-release",
+=======
+          - {
+            name: "Windows MSVC Release",
+            os: windows-latest,
+            artifact: "gfxreconstruct-dev-windows-msvc-release",
+            test_failure_artifact: "gfxreconstruct-dev-test-failure-windows-msvc-release",
+>>>>>>> .github/workflows/ci_build.yml
             type: "release",
             build_dir: "build",
             cc: "cl", cxx: "cl"
           }
+<<<<<<< .github/workflows/ci_build.yml
         - {
             name: "Windows MSVC Debug",
             os: windows-latest,
             artifact: "gfxreconstruct-dev-windows-msvc-debug",
+=======
+          - {
+            name: "Windows MSVC Debug",
+            os: windows-latest,
+            artifact: "gfxreconstruct-dev-windows-msvc-debug",
+            test_failure_artifact: "gfxreconstruct-dev-test-failure-windows-msvc-debug",
+>>>>>>> .github/workflows/ci_build.yml
             type: "debug",
             build_dir: "dbuild",
             cc: "cl", cxx: "cl"
           }
     steps:
+<<<<<<< .github/workflows/ci_build.yml
     - name: Clone repository
       uses: actions/checkout@v1
     - name: Run build script
       run: |
         python scripts\build.py --skip-check-code-style --skip-tests --config ${{ matrix.config.type }} --parallel 0
+=======
+    - name: Require Python 3.10
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.10'
+    - name: Install Ply Python Module
+      run: pip install ply
+    - name: Run with VsDevCmd
+      uses: ilammy/msvc-dev-cmd@v1
+    - name: Install SDK 26100
+      uses: GuillaumeFalourd/setup-windows10-sdk-action@v2
+      with:
+        sdk-version: 26100
+    - name: Set WindowsSDKVersion
+      run:
+        echo ("WindowsSDKVersion=10.0.26100.0\") >> $env:GITHUB_ENV
+    - name: Clone repository from merge of PR branch and dev branch
+      uses: actions/checkout@v4
+      with:
+        submodules: 'recursive'
+    - name: Check generated code
+      run: |
+        python3 framework/generated/generate_dx12.py # check generated code isn't out of date
+        git diff --exit-code
+    - name: Run build script
+      run: |
+        python scripts\build.py --skip-check-code-style --config ${{ matrix.config.type }} --parallel 0 --test-apps
+    - name: Run test app test cases
+      id: test_apps
+      run: |
+        curl.exe -o vulkan-sdk.zip https://sdk.lunarg.com/sdk/download/1.3.296.0/windows/VulkanRT-1.3.296.0-Components.zip
+        Expand-Archive vulkan-sdk.zip -DestinationPath $pwd\vulkan-sdk
+        $env:Path += ";$pwd\vulkan-sdk\VulkanRT-1.3.296.0-Components\x64"
+        cd ${{matrix.config.build_dir}}\windows\x64\output\test
+        ./run-tests.ps1
+    - name: Upload test failure artifacts
+      uses: actions/upload-artifact@v4
+      if: ${{ failure() && steps.test_apps.conclusion == 'failure' }}
+      with:
+        name: ${{ matrix.config.test_failure_artifact }}
+        path: ${{matrix.config.build_dir}}\windows\x64\output\test
+>>>>>>> .github/workflows/ci_build.yml
     - name: Prepare artifacts
       run: |
         copy LICENSE.txt ${{ matrix.config.build_dir }}\windows\x64\output\bin\
@@ -106,7 +227,11 @@ jobs:
         copy layer\vk_layer_settings.txt ${{ matrix.config.build_dir }}\windows\x64\output\bin\
         move ${{ matrix.config.build_dir }}\windows\x64\output\bin gfxreconstruct-dev
     - name: Upload artifacts
+<<<<<<< .github/workflows/ci_build.yml
       uses: actions/upload-artifact@v1
+=======
+      uses: actions/upload-artifact@v4
+>>>>>>> .github/workflows/ci_build.yml
       with:
         name: ${{ matrix.config.artifact }}
         path: .\gfxreconstruct-dev
@@ -118,6 +243,7 @@ jobs:
       fail-fast: false
       matrix:
         config:
+<<<<<<< .github/workflows/ci_build.yml
         - {
             name: "macOS Release",
             os: macos-latest,
@@ -129,12 +255,35 @@ jobs:
             name: "macOS Debug",
             os: macos-latest,
             artifact: "gfxreconstruct-dev-macOS-debug",
+=======
+          - {
+            name: "macOS Release",
+            os: macos-latest,
+            artifact: "gfxreconstruct-dev-macOS-release",
+            test_failure_artifact: "gfxreconstruct-dev-test-failure-macOS-release",
+            type: "release",
+            build_dir: "build"
+          }
+          - {
+            name: "macOS Debug",
+            os: macos-latest,
+            artifact: "gfxreconstruct-dev-macOS-debug",
+            test_failure_artifact: "gfxreconstruct-dev-test-failure-macOS-debug",
+>>>>>>> .github/workflows/ci_build.yml
             type: "debug",
             build_dir: "dbuild"
           }
     steps:
     - name: Clone repository
+<<<<<<< .github/workflows/ci_build.yml
       uses: actions/checkout@v1
+=======
+      uses: actions/checkout@v4
+      with:
+        submodules: 'recursive'
+    - name: Setup sccache
+      uses: mozilla-actions/sccache-action@v0.0.9
+>>>>>>> .github/workflows/ci_build.yml
     - name: Cache dependencies
       id: cache-deps
       uses: actions/cache@v3
@@ -146,7 +295,46 @@ jobs:
       run: .github/workflows/scripts/build-dependencies-macos.sh
     - name: Run build script
       run: |
+<<<<<<< .github/workflows/ci_build.yml
         python3 scripts/build.py --skip-check-code-style --skip-tests --config ${{ matrix.config.type }} --cmake-extra "CMAKE_PREFIX_PATH=$HOME/deps" --cmake-extra CMAKE_OSX_DEPLOYMENT_TARGET=11.0 --parallel 0
+=======
+        python3 scripts/build.py --skip-check-code-style --config ${{ matrix.config.type }} --cmake-extra "CMAKE_PREFIX_PATH=$HOME/deps" --cmake-extra CMAKE_OSX_DEPLOYMENT_TARGET=13.3 --parallel 0 --test-apps
+      env:
+        SCCACHE_GHA_ENABLED: on
+        SCCACHE_CACHE_MULTIARCH: on
+        SCCACHE_IDLE_TIMEOUT: 0
+        CMAKE_C_COMPILER_LAUNCHER: sccache
+        CMAKE_CXX_COMPILER_LAUNCHER: sccache
+    - name: Run test app test cases
+      id: test_apps
+      run: |
+        WORKING_PATH="$(pwd)/${{matrix.config.build_dir}}/darwin/universal/output/test"
+        cd $WORKING_PATH
+        curl https://sdk.lunarg.com/sdk/download/1.4.304.0/mac/vulkansdk-macos-1.4.304.0.zip -o ./vulkan-sdk.zip
+        unzip ./vulkan-sdk.zip -d ./vulkan-sdk
+        sudo ./vulkan-sdk/InstallVulkan.app/Contents/MacOS/InstallVulkan --root $(pwd)/VulkanSDK/1.3.304.0 --accept-licenses --default-answer --confirm-command install
+        sudo dscl . -create /Users/test
+        sudo dscl . append /Groups/staff GroupMembership test
+        sudo dscl . -create /Users/test UserShell /bin/bash
+        sudo dscl . -create /Users/test RealName "Test"
+        sudo dscl . -create /Users/test UniqueID "1001"
+        sudo dscl . -create /Users/test PrimaryGroupID 80
+        sudo dscl . -create /Users/test NFSHomeDirectory /Users/test
+        sudo mkdir -p /Users/test
+        sudo chown -R test:staff /Users/test
+        sudo chmod -R g+w .
+        sudo su - test -c "cd $WORKING_PATH && VULKAN_LIBRARY_PATH=$(pwd)/VulkanSDK/1.3.304.0/macOS/lib/libvulkan.dylib ./run-tests_macos.sh"
+    - name: Upload test failure artifacts
+      uses: actions/upload-artifact@v4
+      if: ${{ failure() && steps.test_apps.conclusion == 'failure' }}
+      with:
+        name: ${{ matrix.config.test_failure_artifact }}
+        path: |
+          ${{matrix.config.build_dir}}/darwin/universal/output/test
+          !${{matrix.config.build_dir}}/darwin/universal/output/test/vulkan-sdk
+          !${{matrix.config.build_dir}}/darwin/universal/output/test/vulkan-sdk.zip
+          !${{matrix.config.build_dir}}/darwin/universal/output/test/VulkanSDK
+>>>>>>> .github/workflows/ci_build.yml
     - name: Prepare artifacts
       run: |
         cp LICENSE.txt ${{ matrix.config.build_dir }}/darwin/universal/output/bin/
@@ -161,7 +349,11 @@ jobs:
         cd gfxreconstruct-dev
         zip -r9 "../${{ matrix.config.artifact }}.zip" *
     - name: Upload artifacts
+<<<<<<< .github/workflows/ci_build.yml
       uses: actions/upload-artifact@v1
+=======
+      uses: actions/upload-artifact@v4
+>>>>>>> .github/workflows/ci_build.yml
       with:
         name: ${{ matrix.config.artifact }}
         path: ${{ matrix.config.artifact }}.zip
@@ -173,6 +365,7 @@ jobs:
       fail-fast: false
       matrix:
         config:
+<<<<<<< .github/workflows/ci_build.yml
         - {
             name: "Android Release/Debug",
             os: ubuntu-latest,
@@ -206,3 +399,65 @@ jobs:
       with:
         name: ${{ matrix.config.artifact }}
         path: ./gfxreconstruct-dev
+=======
+          - {
+            name: "Android Debug",
+            os: ubuntu-latest,
+            type: "debug",
+            artifact: "gfxreconstruct-dev-android-debug",
+            test_failure_artifact: "gfxreconstruct-dev-test-failure-android-debug"
+          }
+          - {
+            name: "Android Release",
+            os: ubuntu-latest,
+            type: "release",
+            artifact: "gfxreconstruct-dev-android-release",
+            test_failure_artifact: "gfxreconstruct-dev-test-failure-android-release"
+          }
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+      - name: Setup sccache
+        uses: mozilla-actions/sccache-action@v0.0.9
+      - name: Set up Java
+        uses: "actions/setup-java@v4"
+        with:
+          java-version: 17
+          distribution: "temurin"
+      - name: Gradle build
+        run: |
+          cd android
+          if [ "${{ matrix.config.type }}" == "release" ]
+          then
+            sh gradlew assembleRelease -Parm64-v8a
+          else
+            sh gradlew assembleDebug -Parm64-v8a
+          fi
+        env:
+          SCCACHE_GHA_ENABLED: on
+          CMAKE_C_COMPILER_LAUNCHER: sccache
+          CMAKE_CXX_COMPILER_LAUNCHER: sccache
+      - name: Prepare artifacts
+        run: |
+          mkdir gfxreconstruct-dev
+          mkdir gfxreconstruct-dev/layer
+          mkdir gfxreconstruct-dev/tools
+          cp LICENSE.txt gfxreconstruct-dev/
+          cp LICENSE_ThirdParty.txt gfxreconstruct-dev/
+          cp USAGE_android.md gfxreconstruct-dev/
+          cp layer/vk_layer_settings.txt gfxreconstruct-dev/
+          if [ "${{ matrix.config.type }}" == "release" ]
+          then
+              cp -r android/layer/build/intermediates/cxx/RelWithDebInfo/*/obj/arm64-v8a gfxreconstruct-dev/layer/
+          else
+              cp android/tools/replay/build/outputs/apk/debug/replay-debug.apk gfxreconstruct-dev/tools/
+          fi
+          cp android/scripts/gfxrecon.py gfxreconstruct-dev/tools/
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.config.artifact }}
+          path: ./gfxreconstruct-dev
+>>>>>>> .github/workflows/ci_build.yml
diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml
index 41348d4..65cba94 100644
--- a/.github/workflows/release_build.yml
+++ b/.github/workflows/release_build.yml
@@ -23,7 +23,18 @@ name: Release Build
 on:
   push:
     tags:
+<<<<<<< .github/workflows/release_build.yml
       - v*
+=======
+      - v[0-9]*
+  workflow_dispatch:
+    inputs:
+      branch_name:
+        description: 'Branch to run workflow on'
+        required: true
+        default: 'dev'
+        type: string
+>>>>>>> .github/workflows/release_build.yml
 
 jobs:
   linux:
@@ -35,13 +46,23 @@ jobs:
         config:
         - {
             name: "Ubuntu GCC Release",
+<<<<<<< .github/workflows/release_build.yml
             os: ubuntu-20.04,
+=======
+            os: ubuntu-latest,
+>>>>>>> .github/workflows/release_build.yml
             artifact: "gfxreconstruct-ubuntu-gcc-release",
             cc: "gcc", cxx: "g++"
           }
     steps:
     - name: Clone repository
+<<<<<<< .github/workflows/release_build.yml
       uses: actions/checkout@v1
+=======
+      uses: actions/checkout@v4
+      with:
+        submodules: 'recursive'
+>>>>>>> .github/workflows/release_build.yml
     - name: Install dependencies
       run: |
         sudo apt-get update
@@ -59,7 +80,11 @@ jobs:
         mv build/linux/x64/output/lib*/*.so gfxreconstruct-dev/
         mv build/linux/x64/output/share/vulkan/explicit_layer.d/*.json gfxreconstruct-dev/
     - name: Upload artifacts
+<<<<<<< .github/workflows/release_build.yml
       uses: actions/upload-artifact@v1
+=======
+      uses: actions/upload-artifact@v4
+>>>>>>> .github/workflows/release_build.yml
       with:
         name: ${{ matrix.config.artifact }}
         path: ./gfxreconstruct-dev
@@ -79,7 +104,13 @@ jobs:
           }
     steps:
     - name: Clone repository
+<<<<<<< .github/workflows/release_build.yml
       uses: actions/checkout@v1
+=======
+      uses: actions/checkout@v4
+      with:
+        submodules: 'recursive'
+>>>>>>> .github/workflows/release_build.yml
     - name: Run build script
       run: |
         python scripts\build.py --skip-check-code-style --skip-tests --parallel 0
@@ -92,11 +123,65 @@ jobs:
         copy layer\vk_layer_settings.txt build\windows\x64\output\bin\
         move build\windows\x64\output\bin gfxreconstruct-dev
     - name: Upload artifacts
+<<<<<<< .github/workflows/release_build.yml
       uses: actions/upload-artifact@v1
+=======
+      uses: actions/upload-artifact@v4
+>>>>>>> .github/workflows/release_build.yml
       with:
         name: ${{ matrix.config.artifact }}
         path: .\gfxreconstruct-dev
 
+<<<<<<< .github/workflows/release_build.yml
+=======
+  macOS:
+    name: ${{ matrix.config.name }}
+    runs-on: ${{ matrix.config.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - {
+            name: "macOS Release",
+            os: macos-latest,
+            artifact: "gfxreconstruct-macos-release",
+            type: "release",
+            build_dir: "build"
+          }
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+      - name: Cache dependencies
+        id: cache-deps
+        uses: actions/cache@v3
+        with:
+          path: ~/deps
+          key: ${{ matrix.config.os }} deps ${{ hashFiles('.github/workflows/scripts/build-dependencies-macos.sh') }}
+      - name: Build dependencies
+        if: steps.cache-deps.outputs.cache-hit != 'true'
+        run: .github/workflows/scripts/build-dependencies-macos.sh
+      - name: Run build script
+        run: |
+          python3 scripts/build.py --skip-check-code-style --skip-tests --config ${{ matrix.config.type }} --cmake-extra "CMAKE_PREFIX_PATH=$HOME/deps" --cmake-extra CMAKE_OSX_DEPLOYMENT_TARGET=13.3 --parallel 0
+      - name: Prepare artifacts
+        run: |
+          cp LICENSE.txt ${{ matrix.config.build_dir }}/darwin/universal/output/bin/
+          cp LICENSE_ThirdParty.txt ${{ matrix.config.build_dir }}/darwin/universal/output/bin/
+          cp USAGE_desktop_Vulkan.md ${{ matrix.config.build_dir }}/darwin/universal/output/bin/
+          cp layer/vk_layer_settings.txt ${{ matrix.config.build_dir }}/darwin/universal/output/bin/
+          mv ${{ matrix.config.build_dir }}/darwin/universal/output/bin gfxreconstruct-dev
+          mv ${{ matrix.config.build_dir }}/darwin/universal/output/lib*/*.dylib gfxreconstruct-dev/
+          mv ${{ matrix.config.build_dir }}/darwin/universal/output/share/vulkan/explicit_layer.d/*.json gfxreconstruct-dev/
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.config.artifact }}
+          path: ./gfxreconstruct-dev
+
+>>>>>>> .github/workflows/release_build.yml
   android:
     name: ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}
@@ -104,6 +189,7 @@ jobs:
       fail-fast: false
       matrix:
         config:
+<<<<<<< .github/workflows/release_build.yml
         - {
             name: "Android Release/Debug",
             os: ubuntu-latest,
@@ -119,6 +205,40 @@ jobs:
       run: |
         cd android
         sh gradlew assembleRelease assembleDebug
+=======
+          - {
+            name: "Android Debug",
+            os: ubuntu-latest,
+            type: "debug",
+            artifact: "gfxreconstruct-android-debug",
+          }
+          - {
+            name: "Android Release",
+            os: ubuntu-latest,
+            type: "release",
+            artifact: "gfxreconstruct-android-release",
+          }
+    steps:
+    - name: Clone repository
+      uses: actions/checkout@v4
+      with:
+        submodules: 'recursive'
+    - name: Set up Java
+      uses: "actions/setup-java@v4"
+      with:
+        java-version: 17
+        distribution: "temurin"
+    - name: Gradle build
+      run: |
+        cd android
+        if [ "${{ matrix.config.type }}" == "release" ]
+        then
+          sh gradlew assembleRelease -Parm64-v8a
+          sh gradlew assembleRelease -Parmeabi-v7a
+        else
+          sh gradlew assembleDebug -Parm64-v8a
+        fi
+>>>>>>> .github/workflows/release_build.yml
     - name: Prepare artifacts
       run: |
         mkdir gfxreconstruct-dev
@@ -128,12 +248,25 @@ jobs:
         cp LICENSE_ThirdParty.txt gfxreconstruct-dev/
         cp USAGE_android.md gfxreconstruct-dev/
         cp layer/vk_layer_settings.txt gfxreconstruct-dev/
+<<<<<<< .github/workflows/release_build.yml
         cp -r android/layer/build/intermediates/cmake/release/obj/arm64-v8a gfxreconstruct-dev/layer/
         cp -r android/layer/build/intermediates/cmake/release/obj/armeabi-v7a gfxreconstruct-dev/layer/
         cp android/tools/replay/build/outputs/apk/debug/replay-debug.apk gfxreconstruct-dev/tools/
         cp android/scripts/gfxrecon.py gfxreconstruct-dev/tools/
     - name: Upload artifacts
       uses: actions/upload-artifact@v1
+=======
+        if [ "${{ matrix.config.type }}" == "release" ]
+        then
+            cp -r android/layer/build/intermediates/cxx/RelWithDebInfo/*/obj/arm64-v8a gfxreconstruct-dev/layer/
+            cp -r android/layer/build/intermediates/cxx/RelWithDebInfo/*/obj/armeabi-v7a gfxreconstruct-dev/layer/
+        else
+            cp android/tools/replay/build/outputs/apk/debug/replay-debug.apk gfxreconstruct-dev/tools/
+        fi
+        cp android/scripts/gfxrecon.py gfxreconstruct-dev/tools/
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v4
+>>>>>>> .github/workflows/release_build.yml
       with:
         name: ${{ matrix.config.artifact }}
         path: ./gfxreconstruct-dev
@@ -141,10 +274,20 @@ jobs:
   release:
     name: Create Release for Tag
     runs-on: ubuntu-latest
+<<<<<<< .github/workflows/release_build.yml
     needs: [ linux, windows, android ]
     steps:
     - name: Clone repository
       uses: actions/checkout@v1
+=======
+    needs: [ linux, windows, android, macOS ]
+    if: ${{ github.event_name == 'push' }}
+    steps:
+    - name: Clone repository
+      uses: actions/checkout@v4
+      with:
+        submodules: 'recursive'
+>>>>>>> .github/workflows/release_build.yml
     - name: Get tag body
       id: get_tag_body
       run: |
@@ -171,7 +314,11 @@ jobs:
       run: |
         echo "${{ steps.create_release.outputs.upload_url }}" > ./release_url
     - name: Upload release URL
+<<<<<<< .github/workflows/release_build.yml
       uses: actions/upload-artifact@v1
+=======
+      uses: actions/upload-artifact@v4
+>>>>>>> .github/workflows/release_build.yml
       with:
         name: release_url
         path: ./release_url
@@ -180,6 +327,10 @@ jobs:
     name: ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}
     needs: release
+<<<<<<< .github/workflows/release_build.yml
+=======
+    if: ${{ github.event_name == 'push' }}
+>>>>>>> .github/workflows/release_build.yml
     strategy:
       fail-fast: false
       matrix:
@@ -201,6 +352,17 @@ jobs:
             type: "application/zip"
           }
         - {
+<<<<<<< .github/workflows/release_build.yml
+=======
+          name: "Upload MacOS Release Artifact",
+          os: ubuntu-latest,
+          artifact: "gfxreconstruct-macos-release",
+          command: "tar czf",
+          suffix: "macos.tar.gz",
+          type: "application/x-gtar"
+        }
+        - {
+>>>>>>> .github/workflows/release_build.yml
             name: "Upload Android Release Artifact",
             os: ubuntu-latest,
             artifact: "gfxreconstruct-android",
@@ -215,7 +377,11 @@ jobs:
         tag_name=`echo "${{ github.ref }}" | cut -d "/" -f 3`
         echo "::set-output name=tag_name::$tag_name"
     - name: Download artifacts
+<<<<<<< .github/workflows/release_build.yml
       uses: actions/download-artifact@v1
+=======
+      uses: actions/download-artifact@v4
+>>>>>>> .github/workflows/release_build.yml
       with:
         name: ${{ matrix.config.artifact }}
         path: ./gfxreconstruct-${{ steps.get_tag_name.outputs.tag_name }}
@@ -223,7 +389,11 @@ jobs:
       run: |
         ${{ matrix.config.command }} gfxreconstruct-${{ steps.get_tag_name.outputs.tag_name }}-${{ matrix.config.suffix }} gfxreconstruct-${{ steps.get_tag_name.outputs.tag_name }}
     - name: Download release URL
+<<<<<<< .github/workflows/release_build.yml
       uses: actions/download-artifact@v1
+=======
+      uses: actions/download-artifact@v4
+>>>>>>> .github/workflows/release_build.yml
       with:
         name: release_url
         path: ./
diff --git a/.github/workflows/scripts/build-dependencies-macos.sh b/.github/workflows/scripts/build-dependencies-macos.sh
index 12a28c5..d777c3b 100755
--- a/.github/workflows/scripts/build-dependencies-macos.sh
+++ b/.github/workflows/scripts/build-dependencies-macos.sh
@@ -7,7 +7,11 @@ export MACOSX_DEPLOYMENT_TARGET=11.0
 INSTALLDIR="${INSTALLDIR:-"$HOME/deps"}"
 NPROCS="${NPROCS:-$(getconf _NPROCESSORS_ONLN)}"
 ZSTD=1.5.5
+<<<<<<< .github/workflows/scripts/build-dependencies-macos.sh
 LZ4=1.9.4
+=======
+LZ4=1.10.0
+>>>>>>> .github/workflows/scripts/build-dependencies-macos.sh
 ZLIB=1.3.1
 
 mkdir deps-build
@@ -19,7 +23,11 @@ export CXXFLAGS="-I$INSTALLDIR/include -Os $CXXFLAGS"
 
 cat > SHASUMS <<EOF
 9c4396cc829cfae319a6e2615202e82aad41372073482fce286fac78646d3ee4  zstd-$ZSTD.tar.gz
+<<<<<<< .github/workflows/scripts/build-dependencies-macos.sh
 0b0e3aa07c8c063ddf40b082bdf7e37a1562bda40a0ff5272957f3e987e0e54b  lz4-$LZ4.tar.gz
+=======
[phone]b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b  lz4-$LZ4.tar.gz
+>>>>>>> .github/workflows/scripts/build-dependencies-macos.sh
 9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23  zlib-$ZLIB.tar.gz
 EOF
 
@@ -41,7 +49,11 @@ cd ..
 echo "Installing zstd..."
 tar xf "zstd-$ZSTD.tar.gz"
 cd "zstd-$ZSTD"
+<<<<<<< .github/workflows/scripts/build-dependencies-macos.sh
 cmake -B build-dir build/cmake -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DZSTD_BUILD_SHARED=OFF -DCMAKE_BUILD_TYPE=MinSizeRel
+=======
+cmake -B build-dir build/cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DZSTD_BUILD_SHARED=OFF -DCMAKE_BUILD_TYPE=MinSizeRel
+>>>>>>> .github/workflows/scripts/build-dependencies-macos.sh
 make -C build-dir "-j$NPROCS"
 make -C build-dir install
 cd ..
@@ -49,7 +61,11 @@ cd ..
 echo "Installing zlib..."
 tar xf "zlib-$ZLIB.tar.gz"
 cd "zlib-$ZLIB"
+<<<<<<< .github/workflows/scripts/build-dependencies-macos.sh
 cmake -B build-dir build/cmake -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DZLIB_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=MinSizeRel
+=======
+cmake -B build-dir build/cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DZLIB_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=MinSizeRel
+>>>>>>> .github/workflows/scripts/build-dependencies-macos.sh
 make -C build-dir "-j$NPROCS"
 make -C build-dir install
 cd ..
diff --git a/.github/workflows/sdk_android_build.yml b/.github/workflows/sdk_android_build.yml
index 5e71094..2d7ca2e 100644
--- a/.github/workflows/sdk_android_build.yml
+++ b/.github/workflows/sdk_android_build.yml
@@ -35,10 +35,21 @@ jobs:
           }
     steps:
     - name: Clone repository
+<<<<<<< .github/workflows/sdk_android_build.yml
       uses: actions/checkout@v1
     - name: Update submodules
       run: |
         git submodule update --init
+=======
+      uses: actions/checkout@v4
+      with:
+        submodules: 'recursive'
+    - name: Set up Java
+      uses: "actions/setup-java@v4"
+      with:
+        java-version: 17
+        distribution: "temurin"
+>>>>>>> .github/workflows/sdk_android_build.yml
     - name: Gradle build
       run: |
         cd android
@@ -52,12 +63,21 @@ jobs:
         cp LICENSE_ThirdParty.txt gfxreconstruct-dev/
         cp USAGE_android.md gfxreconstruct-dev/
         cp layer/vk_layer_settings.txt gfxreconstruct-dev/
+<<<<<<< .github/workflows/sdk_android_build.yml
         cp -r android/layer/build/intermediates/cmake/release/obj/arm64-v8a gfxreconstruct-dev/layer/
         cp -r android/layer/build/intermediates/cmake/release/obj/armeabi-v7a gfxreconstruct-dev/layer/
         cp android/tools/replay/build/outputs/apk/debug/replay-debug.apk gfxreconstruct-dev/tools/
         cp android/scripts/gfxrecon.py gfxreconstruct-dev/tools/
     - name: Upload artifacts
       uses: actions/upload-artifact@v1
+=======
+        cp -r android/layer/build/intermediates/cxx/RelWithDebInfo/*/obj/arm64-v8a gfxreconstruct-dev/layer/
+        cp -r android/layer/build/intermediates/cxx/RelWithDebInfo/*/obj/armeabi-v7a gfxreconstruct-dev/layer/
+        cp android/tools/replay/build/outputs/apk/debug/replay-debug.apk gfxreconstruct-dev/tools/
+        cp android/scripts/gfxrecon.py gfxreconstruct-dev/tools/
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v4
+>>>>>>> .github/workflows/sdk_android_build.yml
       with:
         name: ${{ matrix.config.artifact }}
         path: ./gfxreconstruct-dev
@@ -92,7 +112,11 @@ jobs:
       run: |
         echo "${{ steps.create_release.outputs.upload_url }}" > ./release_url
     - name: Upload release URL
+<<<<<<< .github/workflows/sdk_android_build.yml
       uses: actions/upload-artifact@v1
+=======
+      uses: actions/upload-artifact@v4
+>>>>>>> .github/workflows/sdk_android_build.yml
       with:
         name: release_url
         path: ./release_url
@@ -128,7 +152,11 @@ jobs:
         tag_name=`echo "${{ github.ref }}" | cut -d "/" -f 3`
         echo "::set-output name=tag_name::$tag_name"
     - name: Download artifacts
+<<<<<<< .github/workflows/sdk_android_build.yml
       uses: actions/download-artifact@v1
+=======
+      uses: actions/download-artifact@v4
+>>>>>>> .github/workflows/sdk_android_build.yml
       with:
         name: ${{ matrix.config.artifact }}
         path: ./gfxreconstruct-${{ steps.get_tag_name.outputs.tag_name }}
@@ -136,7 +164,11 @@ jobs:
       run: |
         ${{ matrix.config.command }} gfxreconstruct-${{ steps.get_tag_name.outputs.tag_name }}-${{ matrix.config.suffix }} gfxreconstruct-${{ steps.get_tag_name.outputs.tag_name }}
     - name: Download release URL
+<<<<<<< .github/workflows/sdk_android_build.yml
       uses: actions/download-artifact@v1
+=======
+      uses: actions/download-artifact@v4
+>>>>>>> .github/workflows/sdk_android_build.yml
       with:
         name: release_url
         path: ./
diff --git a/.gitignore b/.gitignore
index fc4f457..34a0533 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,7 @@ __pycache__/
 .cache
 .DS_Store
 external/wayland-protocols/
+<<<<<<< .gitignore
+=======
+android/layer/assets/
+>>>>>>> .gitignore
diff --git a/.gitmodules b/.gitmodules
index a5284c2..aece6a2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,23 @@
 [submodule "external/Vulkan-Headers"]
 	path = external/Vulkan-Headers
 	url = https://github.com/KhronosGroup/Vulkan-Headers.git
+<<<<<<< .gitmodules
+=======
+	shallow = true
+[submodule "external/SPIRV-Headers"]
+	path = external/SPIRV-Headers
+	url = https://github.com/KhronosGroup/SPIRV-Headers.git
+	shallow = true
+[submodule "external/SPIRV-Reflect"]
+	path = external/SPIRV-Reflect
+	url = https://github.com/KhronosGroup/SPIRV-Reflect.git
+	shallow = true
+[submodule "external/OpenXR-SDK"]
+	path = external/OpenXR-SDK
+	url = https://github.com/KhronosGroup/OpenXR-SDK.git
+	shallow = true
+[submodule "external/OpenXR-Docs"]
+	path = external/OpenXR-Docs
+	url = https://github.com/KhronosGroup/OpenXR-Docs.git
+	shallow = true
+>>>>>>> .gitmodules
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5fbdcd1..b9e087e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,24 +32,56 @@ set_property(GLOBAL PROPERTY TEST_SCRIPT ${CMAKE_ROOT})
 
 include(GNUInstallDirs)
 
+<<<<<<< CMakeLists.txt
 set(CMAKE_CXX_STANDARD 17)
 set(CXX_STANDARD_REQUIRED ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_SOURCE_DIR}/external/cmake-modules")
+=======
+set(CMAKE_CXX_STANDARD 20)
+set(CXX_STANDARD_REQUIRED ON)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" "${PROJECT_SOURCE_DIR}/external/cmake-modules")
+set(CMAKE_CXX_VISIBILITY_PRESET "hidden")
+set(CMAKE_VISIBILITY_INLINES_HIDDEN "YES")
+
+option(USE_STRICT_COMPILER_WARNINGS "Use a stricter compiler-warning level" OFF)
+
+if (USE_STRICT_COMPILER_WARNINGS)
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wconversion -Wextra -Werror -Wshadow -Wno-unused-parameter -Wno-unused-function -Wno-missing-field-initializers")
+    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wconversion -Wextra -Werror -Wshadow -Wno-unused-parameter -Wno-unused-function -Wno-missing-field-initializers")
+    else ()
+        message(WARNING "option 'USE_STRICT_COMPILER_WARNINGS' is set, but not implemented for this platform")
+    endif ()
+endif (USE_STRICT_COMPILER_WARNINGS)
+>>>>>>> CMakeLists.txt
 
 # Version info
 set(GFXRECONSTRUCT_PROJECT_VERSION_MAJOR 1)
 set(GFXRECONSTRUCT_PROJECT_VERSION_MINOR 0)
+<<<<<<< CMakeLists.txt
 set(GFXRECONSTRUCT_PROJECT_VERSION_PATCH 4)
 
 set(GFXRECON_PROJECT_VERSION_SHA1 "unknown-build-source")
 
 
+=======
+set(GFXRECONSTRUCT_PROJECT_VERSION_PATCH 5)
+
+set(GFXRECON_PROJECT_VERSION_SHA1 "unknown-build-source")
+
+>>>>>>> CMakeLists.txt
 option(BUILD_STATIC "Build static binaries for HPC clusters (will not build the tracer library)" OFF)
 
 if (NOT DEFINED HEADLESS)
     set(HEADLESS TRUE)
+<<<<<<< CMakeLists.txt
 endif()
+=======
+endif ()
+>>>>>>> CMakeLists.txt
 
 include(GetGitRevisionDescription)
 get_git_head_revision(GIT_REFSPEC GIT_SHA1)
@@ -64,6 +96,7 @@ if (GIT_REFSPEC)
     if (GIT_IS_MASTER OR GIT_IS_SDK)
         if (GIT_TAG)
             set(GIT_BRANCH ${GIT_TAG})
+<<<<<<< CMakeLists.txt
         else()
             set(GIT_BRANCH "")
         endif()
@@ -74,31 +107,62 @@ if (GIT_REFSPEC)
         set(GFXRECON_PROJECT_VERSION_DESIGNATION "-dev")
     endif()
 elseif(GIT_TAG)
+=======
+        else ()
+            set(GIT_BRANCH "")
+        endif ()
+        if (NOT DEFINED GFXRECON_PROJECT_VERSION_DESIGNATION)
+            set(GFXRECON_PROJECT_VERSION_DESIGNATION "")
+        endif ()
+    elseif (NOT DEFINED GFXRECON_PROJECT_VERSION_DESIGNATION)
+        set(GFXRECON_PROJECT_VERSION_DESIGNATION "-dev")
+    endif ()
+elseif (GIT_TAG)
+>>>>>>> CMakeLists.txt
     string(REGEX MATCH "^v[0-9]+\.[0-9]+\.[0-9]+$" GIT_IS_VERSION_RELEASE_TAG ${GIT_TAG})
     if (GIT_IS_VERSION_RELEASE_TAG)
         set(GIT_BRANCH ${GIT_TAG})
         set(GFXRECON_PROJECT_VERSION_DESIGNATION "")
+<<<<<<< CMakeLists.txt
     endif()
 elseif(NOT DEFINED GFXRECON_PROJECT_VERSION_DESIGNATION)
     set(GFXRECON_PROJECT_VERSION_DESIGNATION "-unknown")
 endif()
+=======
+    endif ()
+elseif (NOT DEFINED GFXRECON_PROJECT_VERSION_DESIGNATION)
+    set(GFXRECON_PROJECT_VERSION_DESIGNATION "-unknown")
+endif ()
+>>>>>>> CMakeLists.txt
 
 if (GIT_SHA1)
     string(SUBSTRING ${GIT_SHA1} 0 7 GFXRECON_PROJECT_VERSION_SHA1)
 
     if (GIT_BRANCH)
         string(CONCAT GFXRECON_PROJECT_VERSION_SHA1 ${GIT_BRANCH} ":" ${GFXRECON_PROJECT_VERSION_SHA1})
+<<<<<<< CMakeLists.txt
     endif()
+=======
+    endif ()
+>>>>>>> CMakeLists.txt
 
     git_local_changes(GIT_LOCAL_STATE)
     string(COMPARE EQUAL ${GIT_LOCAL_STATE} "DIRTY" GIT_DIRTY)
     if (GIT_DIRTY)
         string(CONCAT GFXRECON_PROJECT_VERSION_SHA1 ${GFXRECON_PROJECT_VERSION_SHA1} "*")
+<<<<<<< CMakeLists.txt
     endif()
 endif()
 
 # Adds all the configure time information into project_version_temp.h.in
 configure_file("${CMAKE_SOURCE_DIR}/project_version.h.in" "${CMAKE_BINARY_DIR}/project_version_temp.h.in")
+=======
+    endif ()
+endif ()
+
+# Adds all the configure time information into project_version_temp.h.in
+configure_file("${PROJECT_SOURCE_DIR}/project_version.h.in" "${CMAKE_BINARY_DIR}/project_version_temp.h.in")
+>>>>>>> CMakeLists.txt
 
 # Generate a "project_version_$<CONFIG>.h" for the current config - necessary to determine the current build configuration
 file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/project_version_$<CONFIG>.h" INPUT "${CMAKE_BINARY_DIR}/project_version_temp.h.in")
@@ -106,6 +170,15 @@ file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/project_version_$<CONFIG>.h" INPUT "${
 # Since project_version_$<CONFIG>.h differs per build, set a compiler definition that files can use to include it
 add_definitions(-DPROJECT_VERSION_HEADER_FILE="project_version_$<CONFIG>.h")
 
+<<<<<<< CMakeLists.txt
+=======
+# Isolate the repo SHA in a library to reduce the amount of recompilation on git commit, checkout, etc.
+# Clients should #include PROJECT_VERSION_HEADER_FILE and call GetProjectVersionString()
+configure_file("${PROJECT_SOURCE_DIR}/project_version_string.h.in" "${CMAKE_BINARY_DIR}/project_version_string.h")
+add_library(project_version "${PROJECT_SOURCE_DIR}/project_version.cpp")
+target_include_directories(project_version PUBLIC "${CMAKE_BINARY_DIR}")
+
+>>>>>>> CMakeLists.txt
 option(BUILD_WERROR "Build with warnings as errors" ON)
 
 # Code checks
@@ -114,6 +187,25 @@ include("Lint")
 include("Test")
 include("FindVulkanVersion")
 
+<<<<<<< CMakeLists.txt
+=======
+set(OPENXR_SUPPORT_ENABLED FALSE)
+
+option(GFXRECON_ENABLE_OPENXR "Enable OpenXR support." ON)
+if (GFXRECON_ENABLE_OPENXR)
+    include("FindOpenXRVersion")
+
+    if ((NOT XR_VERSION_MAJOR STREQUAL "") AND (NOT XR_VERSION_MINOR STREQUAL ""))
+        set(OPENXR_SUPPORT_ENABLED TRUE)
+        message(STATUS "OpenXR support enabled")
+    else()
+        message(FATAL_ERROR "Failed to find OpenXR headers for support!")
+    endif()
+else()
+    message(STATUS "OpenXR support disabled!")
+endif()
+
+>>>>>>> CMakeLists.txt
 # Apply misc build directives to the given target
 macro(common_build_directives TARGET)
     target_code_style_build_directives(${TARGET})
@@ -122,6 +214,7 @@ macro(common_build_directives TARGET)
 endmacro()
 
 option(GFXRECON_ENABLE_RELEASE_ASSERTS "Enable release builds to output failed conditions caught by GFXRECON_ASSERT macro." OFF)
+<<<<<<< CMakeLists.txt
 if(${GFXRECON_ENABLE_RELEASE_ASSERTS})
     add_definitions(-DGFXRECON_ENABLE_RELEASE_ASSERTS)
 endif()
@@ -129,6 +222,17 @@ endif()
 option(GFXRECON_TOCPP_SUPPORT "Build ToCpp export tool as part of GFXReconstruct builds." TRUE)
 
 if(MSVC)
+=======
+if (${GFXRECON_ENABLE_RELEASE_ASSERTS})
+    add_definitions(-DGFXRECON_ENABLE_RELEASE_ASSERTS)
+endif ()
+
+option(GFXRECON_TOCPP_SUPPORT "Build ToCpp export tool as part of GFXReconstruct builds." TRUE)
+
+option(GFXRECON_INCLUDE_TEST_APPS "Build and install test apps" OFF)
+
+if (MSVC)
+>>>>>>> CMakeLists.txt
 
     # The host toolchain architecture (i.e. are the compiler and other tools compiled to ARM/Intel 32bit/64bit binaries):
     message(STATUS "CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE: " ${CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE})
@@ -139,6 +243,7 @@ if(MSVC)
     message(STATUS "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION: " ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION})
 
     set(GFXR_ARM_WINDOWS_BUILD FALSE)
+<<<<<<< CMakeLists.txt
     if(CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64")
         set(GFXR_ARM_WINDOWS_BUILD TRUE)
     endif()
@@ -157,6 +262,42 @@ if(MSVC)
         ${CMAKE_PREFIX_PATH}
        "${CMAKE_SOURCE_DIR}/external/precompiled/win${PRECOMPILED_ARCH}"
        "${CMAKE_SOURCE_DIR}/external/precompiled/win${PRECOMPILED_ARCH}")
+=======
+    # These checks help also keeping `cmake-gui` behaviour consistent when default values are passed.
+
+    # Some IDEs pass -A in lowercase or in mixed case.
+    # Normalize the CMAKE_GENERATOR_PLATFORM string to upper case to avoid architecture detection mismatch.
+    # can't assume ${CMAKE_GENERATOR_PLATFORM} is always defined and/or non-empty!
+    if(NOT "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "")
+        string(TOUPPER "${CMAKE_GENERATOR_PLATFORM}" NORMALIZED_CMAKE_GENERATOR_PLATFORM)
+        if (NORMALIZED_CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64")
+            set(GFXR_ARM_WINDOWS_BUILD TRUE)
+        endif()
+    else()
+        # No target platform is specified. Try to compute using native tools architecture.
+        string(TOUPPER "${CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE}" NORMALIZED_CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE)
+        if(NORMALIZED_CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE STREQUAL "ARM64")
+            set(GFXR_ARM_WINDOWS_BUILD TRUE)
+        endif()
+    endif()
+
+    message(STATUS "GFXR_ARM_WINDOWS_BUILD: " ${GFXR_ARM_WINDOWS_BUILD})
+
+    # Default to using the precompiled LZ4 and ZLIB binaries for VisualStudio builds.
+    set(PRECOMPILED_ARCH "64")
+    if (CMAKE_SIZEOF_VOID_P EQUAL 4)
+        set(PRECOMPILED_ARCH "32")
+    endif (CMAKE_SIZEOF_VOID_P EQUAL 4)
+
+    if (GFXR_ARM_WINDOWS_BUILD)
+        set(PRECOMPILED_ARCH "64-arm")
+    endif (GFXR_ARM_WINDOWS_BUILD)
+
+    set(CMAKE_PREFIX_PATH
+            ${CMAKE_PREFIX_PATH}
+            "${PROJECT_SOURCE_DIR}/external/precompiled/win${PRECOMPILED_ARCH}"
+            "${PROJECT_SOURCE_DIR}/external/precompiled/win${PRECOMPILED_ARCH}")
+>>>>>>> CMakeLists.txt
 
     # Enable LARGEADDRESSAWARE to increase memory address space for 32-bit executables
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
@@ -167,6 +308,7 @@ if(MSVC)
     # Add option to enable/disable launcher and interceptor.
     option(BUILD_LAUNCHER_AND_INTERCEPTOR "Build launcher and interceptor" OFF)
 
+<<<<<<< CMakeLists.txt
     # Add option to enable/disable D3D12 gfxrecon-convert support.
     option(CONVERT_EXPERIMENTAL_D3D12 "Build with convert DX12 enabled" OFF)
 
@@ -196,11 +338,53 @@ if(MSVC)
 
     # Add option to enable/disable AGS support.
     option(GFXRECON_AGS_SUPPORT "Build with AGS support enabled. Ignored if D3D12_SUPPORT=OFF." ON)
+=======
+    # Enable STL locks to work after building capture libs with certain versions of VS
+    add_definitions(-D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
+
+    if (${D3D12_SUPPORT})
+        set(D3D12_INCLUDE_DIRECTORIES "${PROJECT_SOURCE_DIR}/external/AgilitySDK/include")
+        add_definitions(-DD3D12_SUPPORT)
+
+        # Check Windows SDK version and print warning if there is a mismatch.
+        set(EXPECTED_WIN_SDK_VER "10.0.26100.0")
+        if (NOT ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION} STREQUAL ${EXPECTED_WIN_SDK_VER})
+            message(WARNING
+                    "D3D12 support is authored against Windows SDK ${EXPECTED_WIN_SDK_VER}. Windows SDK version "
+                    "${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION} may not be compatible. If you encounter build errors, "
+                    "set D3D12_SUPPORT=OFF or configure the build with the recommended Windows SDK version. See BUILD.md "
+                    "for more information.")
+        endif ()
+
+        find_package(DXC)
+        if (DXC_FOUND)
+            set(D3D12_INCLUDE_DIRECTORIES ${D3D12_INCLUDE_DIRECTORIES} ${DXC_INCLUDE_DIR})
+            add_definitions(-DGFXRECON_DXC_SUPPORT)
+        endif ()
+
+    else ()
+        set(BUILD_LAUNCHER_AND_INTERCEPTOR OFF)
+    endif ()
+
+
+    if (${BUILD_LAUNCHER_AND_INTERCEPTOR})
+        add_definitions(-DBUILD_LAUNCHER_AND_INTERCEPTOR)
+    endif ()
+
+    if(NOT ${GFXR_ARM_WINDOWS_BUILD})
+        # Add option to enable/disable AGS support. Only supported on non-ARM64 builds.
+        option(GFXRECON_AGS_SUPPORT "Build with AGS support enabled. Not supported on Windows on ARM64. Ignored if D3D12_SUPPORT=OFF." ON)
+    else()
+        set(GFXRECON_AGS_SUPPORT OFF)
+        message(STATUS "GFXRECON_AGS_SUPPORT is disabled for Windows on ARM64 builds.")
+    endif()
+>>>>>>> CMakeLists.txt
 
     if (${D3D12_SUPPORT})
         if (${GFXRECON_AGS_SUPPORT})
             if (CMAKE_SIZEOF_VOID_P EQUAL 8)
                 find_package(AGS)
+<<<<<<< CMakeLists.txt
                 if (TARGET AGS::AGS)
                     add_definitions(-DGFXRECON_AGS_SUPPORT)
 
@@ -238,10 +422,58 @@ endif()
 if(WIN32)
 find_package(Detours)
 endif() # WIN32
+=======
+                if (AGS_FOUND)
+                    add_definitions(-DGFXRECON_AGS_SUPPORT)
+
+                    set(D3D12_INCLUDE_DIRECTORIES ${D3D12_INCLUDE_DIRECTORIES} ${AGS_INCLUDE_DIR})
+
+                    # The value for option GFXRECON_AGS_SUPPORT gets cached so use a non-cached variable
+                    # to determine the final result.
+                    set(GFXRECON_AGS_SUPPORT_FINAL ON)
+                else ()
+                    message(WARNING "GFXRECON_AGS_SUPPORT was requested but the required dependencies were not found. "
+                            "AGS support will be disabled.")
+                endif () # AGS_FOUND
+            else ()
+                message(WARNING "GFXRECON_AGS_SUPPORT was requested but is not supported. An x64 build is required. "
+                        "AGS support will be disabled.")
+            endif () # CMAKE_SIZEOF_VOID_P EQUAL 8
+        endif () # GFXRECON_AGS_SUPPORT
+    endif () # D3D12_SUPPORT
+
+else (MSVC)
+    # Turn off D3D12 support for non MSVC builds.
+    set(D3D12_SUPPORT OFF)
+    set(BUILD_LAUNCHER_AND_INTERCEPTOR OFF)
+    if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+        set(CMAKE_PREFIX_PATH
+                ${CMAKE_PREFIX_PATH}
+                "${PROJECT_SOURCE_DIR}/external/precompiled/linux/lib/arm64-v8a")
+    elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm")
+        set(CMAKE_PREFIX_PATH
+                ${CMAKE_PREFIX_PATH}
+                "${PROJECT_SOURCE_DIR}/external/precompiled/linux/lib/arm")
+    endif ()
+endif (MSVC)
+
+if (APPLE)
+    add_link_options(-Wl,-dead_strip -Wl,-dead_strip_dylibs)
+    set(CMAKE_PREFIX_PATH
+            "${PROJECT_SOURCE_DIR}/external/precompiled/macos"
+            ${CMAKE_PREFIX_PATH})
+endif ()
+
+# GFXReconstruct provided find modules
+if (WIN32)
+    find_package(Detours)
+endif () # WIN32
+>>>>>>> CMakeLists.txt
 
 option(LZ4_OPTIONAL "Allow building without LZ4-compression" OFF)
 find_package(LZ4)
 
+<<<<<<< CMakeLists.txt
 if(NOT LZ4_FOUND)
     if(LZ4_OPTIONAL)
         message(STATUS "LZ4 library not found, but declared optional. LZ4 support is disabled.")
@@ -253,10 +485,28 @@ endif()# NOT LZ4_FOUND
 find_package(ZSTD)
 
 if(UNIX AND NOT APPLE)
+=======
+if (NOT LZ4_FOUND)
+    if (LZ4_OPTIONAL)
+        message(STATUS "LZ4 library not found, but declared optional. LZ4 support is disabled.")
+    else ()
+        message(FATAL_ERROR "LZ4 library not found. Please install LZ4 or allow building without it by setting LZ4_OPTIONAL to ON.")
+    endif ()# LZ4_OPTIONAL
+endif ()# NOT LZ4_FOUND
+
+find_package(ZSTD)
+
+# Find and use nlohmann_json
+list(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}/external/nlohmann-json")
+find_package(nlohmann_json REQUIRED)
+
+if (UNIX AND NOT APPLE)
+>>>>>>> CMakeLists.txt
     option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON)
     option(BUILD_WSI_WAYLAND_SUPPORT "Build Wayland WSI support" ON)
     option(BUILD_WSI_DISPLAY_SUPPORT "Build direct-to-display swapchain support" ON)
 
+<<<<<<< CMakeLists.txt
     if(BUILD_WSI_XCB_SUPPORT)
         find_package(XCB)
     endif()
@@ -278,10 +528,34 @@ if(UNIX AND NOT APPLE)
         find_package(X11)
     endif()
 endif(UNIX AND NOT APPLE)
+=======
+    if (BUILD_WSI_XCB_SUPPORT)
+        find_package(XCB)
+    endif ()
+
+    if (BUILD_WSI_WAYLAND_SUPPORT)
+        find_package(WAYLAND)
+    endif ()
+endif (UNIX AND NOT APPLE)
+
+# CMake provided find modules
+if (BUILD_STATIC)
+    find_library(ZLIB NAMES libz.a REQUIRED PATH_SUFFIXES lib lib/x86_64-linux-gnu lib64)
+else ()
+    find_package(ZLIB)
+endif ()
+if (UNIX AND NOT APPLE)
+    option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON)
+    if (BUILD_WSI_XLIB_SUPPORT)
+        find_package(X11)
+    endif ()
+endif (UNIX AND NOT APPLE)
+>>>>>>> CMakeLists.txt
 
 add_library(windows_specific INTERFACE)
 
 target_compile_definitions(windows_specific INTERFACE
+<<<<<<< CMakeLists.txt
     WIN32_LEAN_AND_MEAN
     NOMINMAX
     VK_USE_PLATFORM_WIN32_KHR
@@ -290,10 +564,23 @@ target_compile_definitions(windows_specific INTERFACE
     $<$<BOOL:${D3D12_SUPPORT}>:"GFXR_D3D12_CAPTURE_PATH=\"$<TARGET_FILE:d3d12_capture>\"">
     $<$<BOOL:${D3D12_SUPPORT}>:"GFXR_D3D12_PATH=\"$<TARGET_FILE:d3d12>\"">
     $<$<BOOL:${D3D12_SUPPORT}>:"GFXR_DXGI_PATH=\"$<TARGET_FILE:dxgi>\"">)
+=======
+        WIN32_LEAN_AND_MEAN
+        NOMINMAX
+        VK_USE_PLATFORM_WIN32_KHR
+        XR_USE_PLATFORM_WIN32
+        XR_USE_GRAPHICS_API_VULKAN
+        $<$<BOOL:${HEADLESS}>:VK_USE_PLATFORM_HEADLESS>
+        $<$<BOOL:${BUILD_LAUNCHER_AND_INTERCEPTOR}>:"GFXR_INTERCEPTOR_PATH=\"$<TARGET_FILE:gfxrecon_interceptor>\"">
+        $<$<BOOL:${D3D12_SUPPORT}>:"GFXR_D3D12_CAPTURE_PATH=\"$<TARGET_FILE:d3d12_capture>\"">
+        $<$<BOOL:${D3D12_SUPPORT}>:"GFXR_D3D12_PATH=\"$<TARGET_FILE:d3d12>\"">
+        $<$<BOOL:${D3D12_SUPPORT}>:"GFXR_DXGI_PATH=\"$<TARGET_FILE:dxgi>\"">)
+>>>>>>> CMakeLists.txt
 
 
 add_library(linux_specific INTERFACE)
 target_compile_definitions(linux_specific INTERFACE _FILE_OFFSET_BITS=64 PAGE_GUARD_ENABLE_UCONTEXT_WRITE_DETECTION
+<<<<<<< CMakeLists.txt
     $<$<BOOL:${X11_FOUND}>:VK_USE_PLATFORM_XLIB_KHR>
     $<$<BOOL:${X11_Xrandr_FOUND}>:VK_USE_PLATFORM_XLIB_XRANDR_EXT>
     $<$<BOOL:${XCB_FOUND}>:VK_USE_PLATFORM_XCB_KHR>
@@ -347,10 +634,93 @@ if(NOT BUILD_STATIC)
 endif()
 add_subdirectory(tools)
 
+=======
+        XR_USE_GRAPHICS_API_VULKAN
+        $<$<BOOL:${X11_FOUND}>:VK_USE_PLATFORM_XLIB_KHR XR_USE_PLATFORM_XLIB>
+        $<$<BOOL:${X11_Xrandr_FOUND}>:VK_USE_PLATFORM_XLIB_XRANDR_EXT>
+        $<$<BOOL:${XCB_FOUND}>:VK_USE_PLATFORM_XCB_KHR XR_USE_PLATFORM_XCB>
+        $<$<BOOL:${WAYLAND_FOUND}>:VK_USE_PLATFORM_WAYLAND_KHR XR_USE_PLATFORM_WAYLAND>
+        $<$<BOOL:${BUILD_WSI_DISPLAY_SUPPORT}>:VK_USE_PLATFORM_DISPLAY_KHR>
+        $<$<BOOL:${HEADLESS}>:VK_USE_PLATFORM_HEADLESS>)
+
+add_library(macos_specific INTERFACE)
+target_compile_definitions(macos_specific INTERFACE
+        XR_USE_GRAPHICS_API_VULKAN
+        VK_USE_PLATFORM_METAL_EXT
+        $<$<BOOL:${HEADLESS}>:VK_USE_PLATFORM_HEADLESS>)
+
+add_library(platform_specific INTERFACE)
+target_link_libraries(platform_specific INTERFACE
+        $<$<BOOL:${WIN32}>:windows_specific>
+        $<$<BOOL:${APPLE}>:macos_specific>
+        $<$<NOT:$<OR:$<BOOL:${WIN32}>,$<BOOL:${APPLE}>>>:linux_specific>)
+
+if (BUILD_WERROR)
+    if (MSVC)
+        target_compile_options(platform_specific INTERFACE /WX)
+    else ()
+        target_compile_options(platform_specific INTERFACE -Werror)
+    endif ()
+endif ()
+
+if(MSVC)
+    target_compile_options(platform_specific INTERFACE /MP)
+endif()
+
+add_library(vulkan_registry INTERFACE)
+target_include_directories(vulkan_registry SYSTEM INTERFACE ${PROJECT_SOURCE_DIR}/external/Vulkan-Headers/include)
+target_compile_definitions(vulkan_registry INTERFACE VK_NO_PROTOTYPES VK_ENABLE_BETA_EXTENSIONS)
+
+add_library(spirv_registry INTERFACE)
+target_include_directories(spirv_registry SYSTEM INTERFACE ${PROJECT_SOURCE_DIR}/external/SPIRV-Headers/include)
+
+add_library(OpenXR INTERFACE)
+if (OPENXR_SUPPORT_ENABLED)
+    option(DYNAMIC_LOADER "" OFF)
+    add_subdirectory(${PROJECT_SOURCE_DIR}/external/OpenXR-SDK)
+    target_include_directories(OpenXR INTERFACE ${PROJECT_SOURCE_DIR}/external/OpenXR-SDK/include)
+    target_compile_definitions(OpenXR INTERFACE XR_NO_PROTOTYPES ENABLE_OPENXR_SUPPORT=1)
+endif()
+
+add_library(vulkan_memory_allocator INTERFACE)
+target_compile_options(vulkan_memory_allocator INTERFACE
+        $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:
+        -Wno-nullability-completeness>
+)
+target_include_directories(vulkan_memory_allocator SYSTEM INTERFACE ${PROJECT_SOURCE_DIR}/external/VulkanMemoryAllocator/include)
+
+# SPIRV-Reflect included as submodule -> libspirv-reflect-static.a
+set(SPIRV_REFLECT_EXAMPLES OFF)
+set(SPIRV_REFLECT_EXECUTABLE OFF)
+set(SPIRV_REFLECT_STATIC_LIB ON)
+set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
+add_subdirectory(external/SPIRV-Reflect EXCLUDE_FROM_ALL)
+
+if (${RUN_TESTS})
+    add_library(catch2 INTERFACE)
+    target_include_directories(catch2 SYSTEM INTERFACE external)
+endif ()
+
+add_subdirectory(framework)
+if (NOT BUILD_STATIC)
+    add_subdirectory(layer)
+endif ()
+add_subdirectory(tools)
+
+if (GFXRECON_INCLUDE_TEST_APPS)
+    add_subdirectory(external/Vulkan-Headers)
+    add_subdirectory(test)
+endif ()
+
+>>>>>>> CMakeLists.txt
 if (${RUN_TESTS})
     add_test_package_file(${CMAKE_CURRENT_LIST_DIR}/scripts/build.py)
     add_test_package_file(${CMAKE_CURRENT_LIST_DIR}/scripts/test.py)
     generate_test_package(gfx_reconstruct_test)
+<<<<<<< CMakeLists.txt
 endif()
+=======
+endif ()
+>>>>>>> CMakeLists.txt
 
 add_subdirectory(scripts)
diff --git a/HOWTO_meta_quest.md b/HOWTO_meta_quest.md
new file mode 100644
index 0000000..12406b7
--- /dev/null
+++ b/HOWTO_meta_quest.md
@@ -0,0 +1,458 @@
+<!-- markdownlint-disable MD033 -->
+<!-- markdownlint-disable MD041 -->
+<p align="left"><img src="https://vulkan.lunarg.com/img/NewLunarGLogoBlack.png" alt="LunarG" width=263 height=113 /></p>
+
+[![Creative Commons][1]][2]
+
+[1]: https://i.creativecommons.org/l/by-nd/4.0/88x31.png "Creative Commons License"
+[2]: https://creativecommons.org/licenses/by-nd/4.0/
+
+Copyright &copy; 2024-2025 LunarG, Inc.
+
+# Meta Quest Walkthrough
+
+## EXPERIMENTAL FEATURE!!!
+
+Be aware the OpenXR support within GFXReconstruct is an experimental
+feature, with restricted functionality and testing. See List of Known
+Limitations below.
+
+## Index
+
+1. [Purpose](#purpose)
+2. [Building GFXReconstruct](#building-gfxreconstruct)
+3. [Attaching GFXReconstruct to an Existing Application](#attaching-gfxreconstruct-to-an-existing-application)
+4. [Replaying a Capture File](#replaying-a-capture-file)
+6. [Capturing the Replay Content](#capturing-the-replay-content)
+7. [OpenXR Capture Known Limitations](#openxr-capture-known-limitations)
+
+## Purpose
+
+This document shows several examples of how to use the GFXReconstruct
+tools for the Meta Quest headsets, in particular the Meta Quest
+Pro and Quest 3 models.
+
+These examples assume that the developer is using a Windows system
+as the build and/or host since the Meta Quest Developer Hub tools work
+on Windows and not Linux.
+
+**NOTE:** This assumes the application meets the following requirements
+ * Uses Gradle (preferably 8.0+)
+ * Builds against Android 10+
+
+## Building GFXReconstruct
+
+First, download a version of GFXReconstruct that supports OpenXR
+using the [GFXReconstruct GitHub repo](https://github.com/LunarG/gfxreconstruct).
+
+```bash
+git clone --recurse-submodules https://github.com/LunarG/gfxreconstruct.git
+```
+
+The full location of the `gfxreconstruct` folder generated from this
+step is to be used in all cases below for `{gfxreconstruct_root}`.
+
+Next, follow the instructions in the [BUILD.md doc](./BUILD.md)
+found in the top-level of the GFXReconstruct repo for building
+for an [Android target](./BUILD.md#building-for-android).
+
+
+## Attaching GFXReconstruct to an Existing Application
+
+To attach GFXReconstruct to an existing application
+will require modifying the Gradle files so that the
+application can find and build with the capture layer:
+
+
+### 1. App settings.gradle Changes
+
+Include GFXReconstruct's layer as a known project:
+
+```bash
+include ':VkLayer_gfxreconstruct'
+project(':VkLayer_gfxreconstruct').projectDir = file('{gfxreconstruct_root}\\android\\layer')
+```
+
+Replace `{gfxreconstruct_root}` with the location of your
+GFXReconstruct source pulled down from Github above in
+the [Building GFXReconstruct](#building-gfxreconstruct)
+section.
+
+**NOTE:** Even though the layer is listed as
+"Vk"Layer_gfxreconstruct (as in Vulkan),
+it also contains information for the OpenXR
+API Layer as well.
+
+
+### 2. App build.gradle Changes
+
+Add GFXReconstruct's layer as a dependency:
+
+```bash
+dependencies {
+    implementation project(':VkLayer_gfxreconstruct')
+}
+```
+
+### 3. Adjust App AndroidManifest
+
+Edit the application file to add both the
+`WRITE_EXTERNAL_STORAGE` and `MANAGE_EXTERNAL_STORAGE`
+permissions so that GFXReconstruct can write the
+capture file to your system.
+
+For example:
+
+```bash
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+...
+  <uses-permission android:name="org.khronos.openxr.permission.OPENXR" />
+  <uses-permission android:name="org.khronos.openxr.permission.OPENXR_SYSTEM" />
+...
++  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
++  <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
+...
+```
+
+
+### 4. Building Your App
+
+Build it as normal, it should automatically include
+the necessary library files and OpenXR Implicit
+API Layer.
+
+#### Note About Release Build of App
+
+This step is not necessary for Debug builds of an
+application.
+However, for Release builds, there is some additional
+settings required.
+This is because on Android/Meta OS the Vulkan layer
+is attached at run-time using Android/Meta OS system
+settings.
+If the application does not have the `debuggable`
+flag set to `true` in the build.gradle file, the layer
+will not correctly attach at run-time.
+
+For example:
+
+```bash
+ release {
+     signingConfig signingConfigs.release
+-    debuggable false
++    debuggable true
+...
+     ndk {
+-        debuggable  false
++        debuggable  true
+...
+     }
+ }
+```
+
+### 5. Enable GFXReconstruct Vulkan Capture
+
+Using the ADB installed from the Meta Quest Developer Hub ("C:\Program
+Files\Meta Quest Developer Hub\resources\bin\adb.exe" on some systems),
+enable the GFXReconstruct layer only for the application using the
+global settings:
+
+```bash
+adb shell "settings put global enable_gpu_debug_layers 1"
+adb shell "settings put global gpu_debug_app {Android applicationId}"
+adb shell "settings put global gpu_debug_layers 'VK_LAYER_LUNARG_gfxreconstruct'"
+```
+
+Replace `{Android applicationId}` with the application's Id.
+This Id typically can be found in the `build.gradle` file and
+should look something similar to the following:
+
+* com.facebook.igl.shell.openxr.vulkan
+* net.beyondreality.openxr_provider.finger_painting3.openxr
+
+**NOTE:** If you apply an `applicationIdSuffix`, you should append it to
+the applicationId to get the full Identifier.
+
+#### What do These Commands Do?
+
+The first command setting `enable_gpu_debug_layers` to 1 tells
+the OS that you will be using Debug Vulkan Layers that will be
+attached to the application at runtime.
+
+The second command settings `gpu_debug_app` tells the OS
+which application you want the layer applied to.
+
+The third command setting `gpu_debug_layers` identifies which Debug
+Vulkan layers you want enabled.
+In this case, GFXReconstruct's Vulkan layer name
+`VK_LAYER_LUNARG_gfxreconstruct`.
+
+
+### 6. Set the Capture Options
+
+Now, set the command indicating where to record the contents
+of the capture, in this case to the `/sdcard/Download` folder:
+
+```bash
+adb shell "setprop debug.gfxrecon.capture_file  '/sdcard/Download/openxr_capture.gfxr'"
+```
+
+This commands will result in the capture file being written
+to the `/sdcard/Download` folder on the device with the
+prefix of `openxr_capture` and the suffix of `.gfxr`.
+
+#### Filename With Timestamp
+
+By default, the filename provided above is modified to include
+a timestamp after the main filename.
+For example, with the above information, the expanded
+filename with timestamp may look something like
+`openxr_capture_20240812T132918.gfxr`.
+In general, adding a timestamp to the filename is useful
+since it creates a unique file per run allowing users
+to capture multiple times without fear of overriding
+the previous capture.
+However, if you are using it in a script and it may be useful
+to force a consistent filename by disabling the use of
+the timestamp.
+
+To disable adding a timestamp to the filename when capturing,
+set the following Android property:
+
+```bash
+adb shell "setprop debug.gfxrecon.capture_file_timestamp 0"
+```
+
+**NOTE:** The rest of this document assumes this option
+is enabled simply so we can simplify the naming of the
+capture filename.
+
+
+#### Limit to a Certain Number of Frames
+
+You can adjust how many frames are captured (instead of
+all frames until the app is completed) by defining
+the `debug.gfxrecon.capture_frames` property.
+
+For example, if you want to only capture the first
+500 frames, you do the following:
+
+```bash
+adb shell "setprop debug.gfxrecon.capture_frames '1-500'"
+```
+
+**NOTE:** This will change the name of the capture file generated.
+For example, above we set the capture file to
+`/sdcard/Download/openxr_capture.gfxr`, but with frame limitations
+enabled, it will now be named
+`/sdcard/Download/openxr_capture_frames_1_through_500.gfxr`.
+If timestamps are not disabled, the filename will look even
+more complex, like
+`/sdcard/Download/openxr_capture_frames_1_through_500_20240812T132918.gfxr`.
+
+#### Disable Re-Entrant Cases
+
+By default, GFXReconstruct capturing of OpenXR and Vulkan
+content simultaneously attempts to filter out what we call
+"re-entrant" calls.
+A "re-entrant" call is when the application calls the OpenXR
+runtime, which then creates some graphics API commands
+(for example Vulkan commands) to perform some additional work
+like composition.
+If the application is also performing Vulkan commands,
+which GFXReconstruct is capturing, then GFXReconstruct could
+run into the situation of capturing unnecessary Vulkan commands
+which will be re-generated by the OpenXR at replay time.
+To avoid this, we disable recording any calls while an OpenXR
+command is in the process of being recorded and executed.
+
+However, some calls may continue to occur outside of these
+OpenXR calls.
+In some cases, the OpenXR runtime may have a separate thread
+waiting on `VkFences` that were triggered during an OpenXR call.
+These additional fences would be completely unknown to
+GFXReconstruct because they would have been created and used
+initially outside of its view.
+Therefore, we need to disable recording any Vulkan commands
+that have content we don't recognize.
+
+This is done by setting the following option:
+
+```bash
+adb shell "setprop debug.gfxrecon.skip_threads_with_invalid_data  '1'"
+```
+
+#### Additional Options
+
+More capture options can be found in the
+[USAGE_android.md](./USAGE_android.md) under the [Capture
+Options](./USAGE_android.md#capture-options) section.
+
+### 7. Install and Run the Application
+
+Install the application as normal and run it.
+
+**NOTE:** There are several situations in Android that may
+prevent updating an application that has already been installed
+on the system previously.
+In those situations, it is better to make sure any previous
+installed versions are stopped and uninstalled before
+attempting to install the newer version of the application.
+
+Then run the application as normal to capture
+the content.
+
+If the application fails to launch, review the
+`adb logcat` information for any fatal or error messages.
+Here is a useful filter for logcat messages.
+
+```bash
+adb logcat -s DEBUG vulkan VulkanLoader VulkanLoaderAndroid OpenXR OpenXR-Loader gfxrecon {application log tag}
+```
+
+Replace `{application log tag}` with the logging tag the application
+uses to log messages to logcat.
+
+Once complete, if everything executed correctly, the capture
+file should be present in the `/sdcard/Download` folder.
+
+Check that it exists:
+
+```bash
+adb shell ls /sdcard/Download/openxr_capture*.gfxr
+```
+
+## Replaying a Capture File
+
+
+### 1. Install the Quest Replay Application
+
+Install the GFXReconstruct Quest Replay application
+that is built as part of the Android build of
+GFXReconstruct using the `gfxrecon.py` script:
+
+For example, if installing the Debug build of
+the Quest replay app:
+
+```bash
+cd {gfxreconstruct_root}
+python3 android/scripts/gfxrecon.py install-apk android/tools/quest_replay/build/outputs/apk/debug/quest_replay-debug.apk
+```
+
+Replace `{gfxreconstruct_root}` with the location of your
+GFXReconstruct source pulled down from Github above in
+the [Building GFXReconstruct](#building-gfxreconstruct)
+section.
+
+### 2. Force External Storage Permissions
+
+Even though the Quest Replay application is built enabling external
+storage access permissions in its Android Manifest file,
+it doesn't always appear to stick.
+Because of this, it is best to just force the external storage
+permission on immediately after installing the application to
+allow it to access the files in the `/sdcard/Download` directory:
+
+```bash
+adb shell appops set --uid com.lunarg.gfxreconstruct.replay MANAGE_EXTERNAL_STORAGE allow
+```
+
+### 3. Run the replay
+
+Run the replay using the `gfxrecon.py` script:
+
+```bash
+python3 android/scripts/gfxrecon.py replay sdcard/Download/{capture_file_name}
+```
+
+Replace `{capture_file_name}` with the name of a
+valid capture file that was created.
+The replay should run, perform the appropriate rendering,
+and then close on completion.
+
+
+## Capturing the Replay Content
+
+At times, capturing the Quest replay itself may be of use but
+does require some additional changes.
+
+### 1. Build the Replay Enabling Capture
+
+By default, the Quest replay application does not include the
+necessary OpenXR capture layer manifest files.
+Because of this, you need to pass in the `EnableOpenXRCaptureOfReplay`
+Gradle property during build to properly define all the dependencies
+for the capture layer.
+
+This can be done in the following way:
+
+```bash
+gradlew assembleDebug -PEnableOpenXRCaptureOfReplay=true
+```
+
+Once rebuilt, the capture should be ready from the OpenXR side, however,
+you still will need to enable the Vulkan settings to completely and
+properly capture the necessary content.
+
+### 2. Change the Debug app to the GFXRecon Quest replay app
+
+If you haven't already done so, first follow the instructions to enable
+the debug layer in the
+[Enable GFXReconstruct Vulkan Capture](#5-enable-gfxreconstruct-vulkan-capture)
+section above.
+
+One change is to make sure that:
+* The correct application name is used (here it is the Quest replay
+  application)
+* Adjust the capture file to use a different name than
+  the one being replayed (or it will overwrite what is being read)
+
+```bash
+adb shell settings put global gpu_debug_app com.lunarg.gfxreconstruct.replay
+adb shell "setprop debug.gfxrecon.capture_file  '/sdcard/Download/replay_capture.gfxr'"
+```
+
+### 2. Install the Updated Replay Tool
+
+(Follow instructions in the 
+[1. Install the Quest Replay Application](#1-install-the-quest-replay-application))section above (especially if the Quest replay application was
+previously installed without re-capture enabled).
+
+Repeat the permissions modification as noted in the
+[2. Force External Storage Permissions](#2-force-external-storage-permissions)
+section above.
+
+### 3. Run Logcat
+
+```bash
+adb logcat -s DEBUG vulkan VulkanLoader VulkanLoaderAndroid OpenXR OpenXR-Loader gfxrecon
+```
+
+### 4. Upload the Replay Capture
+
+If the capture file that will be used to replay is not already on
+the device, push it to the device using ADB:
+
+```bash
+adb push {capture_file_name} /sdcard/Download
+```
+
+### 5. Run the Quest Replay Application
+
+Run the replay using the `gfxrecon.py` script:
+
+```bash
+python3 android/scripts/gfxrecon.py replay /sdcard/Download/{capture_file_name}
+```
+
+## OpenXR Capture Known Limitations
+
+The current implementation has been written to cover the OpenXR API
+entrypoints and usage based on a limited number of test applications (listed in issue below).
+It is possible that meaningful omissions or errors in capture and/or
+replay may exist outside the usage tested.
+The current set of known limitations is maintained in
+[GitHub/LunarG/gfxreconstruct issue 2145](https://github.com/LunarG/gfxreconstruct/issues/2145). 
+
diff --git a/LICENSE_ThirdParty.txt b/LICENSE_ThirdParty.txt
index 48923ce..673a38f 100644
--- a/LICENSE_ThirdParty.txt
+++ b/LICENSE_ThirdParty.txt
@@ -1,7 +1,12 @@
 # License Information
 
+<<<<<<< LICENSE_ThirdParty.txt
 License information for third party software that may be statically linked with
 GFXReconstruct binaries.
+=======
+This file contains the license information for third-party software dependencies
+of GFXReconstruct.
+>>>>>>> LICENSE_ThirdParty.txt
 
 
 ## LZ4 Library
@@ -202,7 +207,11 @@ SOFTWARE.
 
 ## AGS
 
+<<<<<<< LICENSE_ThirdParty.txt
 # Copyright (c) 2020 Advanced Micro Devices, Inc. All rights reserved.
+=======
+# Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved.
+>>>>>>> LICENSE_ThirdParty.txt
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -408,3 +417,76 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques.
 Vous pourriez avoir d’autres droits prévus par les lois de votre pays.
 Le présent contrat ne modifie pas les droits que vous confèrent les lois
 de votre pays si celles-ci ne le permettent pas.
+<<<<<<< LICENSE_ThirdParty.txt
+=======
+
+## DirectX Shader Compiler - d3d12shader.h
+
+Copyright (c) Microsoft Corporation.
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+## DirectX Shader Compiler - all other files
+
+==============================================================================
+LLVM Release License
+==============================================================================
+University of Illinois/NCSA
+Open Source License
+
+Copyright (c) 2003-2015 University of Illinois at Urbana-Champaign.
+All rights reserved.
+
+Developed by:
+
+    LLVM Team
+
+    University of Illinois at Urbana-Champaign
+
+    http://llvm.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal with
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimers.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimers in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the names of the LLVM Team, University of Illinois at
+      Urbana-Champaign, nor the names of its contributors may be used to
+      endorse or promote products derived from this Software without specific
+      prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+SOFTWARE.
+>>>>>>> LICENSE_ThirdParty.txt
diff --git a/README.md b/README.md
index 0e3ae8f..b58c82c 100644
--- a/README.md
+++ b/README.md
@@ -1,33 +1,68 @@
 # Project Components
 
+<<<<<<< README.md
 The GFXReconstruct project provides tools for the capture and replay of graphics 
+=======
+The GFXReconstruct project provides tools for the capture and replay of graphics
+>>>>>>> README.md
 API calls, allowing the graphics commands executed by an application
 to be recorded to a file that may later be replayed to reconstruct the
 graphics-specific behavior of the captured application. The replay code has
 been organized with a framework design to make it easy to create additional
+<<<<<<< README.md
 tools for processing capture files. 
+=======
+tools for processing capture files.
+>>>>>>> README.md
 
 The GFXReconstruct components currently provided with this repository are:
 
 * The `VK_LAYER_LUNARG_gfxreconstruct` Vulkan layer for capturing
+<<<<<<< README.md
    Vulkan application commands.
+=======
+  Vulkan application commands.
+>>>>>>> README.md
 * The D3D12 capture libraries for capturing D3D12 application commands.
 * The `gfxrecon-replay` tool to replay GFXReconstruct capture files.
 * The `gfxrecon-info` tool to print information describing GFXReconstruct
   capture files.
 * The `gfxrecon-compress` tool to compress/decompress GFXReconstruct
   capture files.
+<<<<<<< README.md
   * **NOTE:** The gfxrecon-compress tool requires LZ4, Zstandard, and/or
     zlib, which are currently optional build dependencies.
+=======
+    * **NOTE:** The gfxrecon-compress tool requires LZ4, Zstandard, and/or
+      zlib, which are currently optional build dependencies.
+>>>>>>> README.md
 * The `gfxrecon-extract` tool to extract SPIR-V binaries from
   GFXReconstruct capture files.
 * The `gfxrecon-convert` tool to convert GFXReconstruct capture files to
   a [JSON Lines](https://jsonlines.org/) listing of API calls. (experimental
   for D3D12 captures)
+<<<<<<< README.md
 * The `gfxrecon-optimize` tool to produce new capture files with 
   improved replay performance.
 
 
+=======
+* The `gfxrecon-optimize` tool to produce new capture files with
+  improved replay performance.
+
+## Experimental OpenXR Support
+
+OpenXR support in GFXReconstruct is experimental and is recommended only for
+developer use for evaluation!
+Only a subset of features and a very small number of apps are supported.
+See [USAGE_desktop_OpenXR](USAGE_desktop_OpenXR.md) and the
+"Supported Capabilities" table below for more detail.
+
+Because OpenXR support is considered a Proof-of-Concept, it is not enabled
+in the SDK built version of GFXReconstruct.
+If OpenXR support is desired, please pull the source down from the
+GitHub repo and build manually.
+>>>>>>> README.md
 
 ## Contributing
 
@@ -37,6 +72,62 @@ submit a pull request.
 Please see the [CONTRIBUTING](CONTRIBUTING.md) file in this repository for
 more details
 
+<<<<<<< README.md
+=======
+## Supported Capabilities
+
+| Capability     |   Windows  |  Linux  |  Mac  |   Android   |  Meta Quest |
+| -------------- | :--------: | :-----: | :-------: | :-----: | :---------: |
+| **Vulkan Support** ||||||
+| Capture | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :construction:  |
+| Replay  | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :construction:  |
+| gfxrecon-compress | :white_check_mark: | :white_check_mark: | :white_check_mark: | :large_orange_diamond: | :large_orange_diamond: |
+| gfxrecon-convert | :white_check_mark: | :white_check_mark: | :white_check_mark: | :large_orange_diamond: | :large_orange_diamond: |
+| gfxrecon-info | :white_check_mark: | :white_check_mark: | :white_check_mark: | :large_orange_diamond: | :large_orange_diamond: |
+| gfxrecon-optimize | :white_check_mark: | :white_check_mark: | :white_check_mark: | :large_orange_diamond: | :x: |
+| gfxrecon-tocpp | :x: | :construction: | :x: | :construction:  | :x: |
+| **D3D12 Support** ||||||
+| Capture  | :white_check_mark: | :x: | :x: | :x: | :x: |
+| Replay   | :white_check_mark: | :x: | :x: | :x: | :x: |
+| gfxrecon-compress | :white_check_mark: | :x: | :x: | :x: | :x: |
+| gfxrecon-convert | :white_check_mark: | :x: | :x: | :x: | :x: |
+| gfxrecon-info | :white_check_mark: | :x: | :x: | :x: | :x: |
+| gfxrecon-optimize | :white_check_mark: | :x: | :x: | :x: | :x: |
+| **OpenXR (Vulkan Graphics API only)** ||||||
+| Capture | :construction: | :construction: | :x: | :construction: | :construction:  |
+| Replay  | :construction: | :construction: | :x: | :construction: | :construction:  |
+| gfxrecon-compress | :construction: | :construction: | :x: | :large_orange_diamond: | :large_orange_diamond: |
+| gfxrecon-convert | :construction: | :construction: | :x: | :large_orange_diamond: | :large_orange_diamond:  |
+| gfxrecon-info | :construction: | :construction: | :x: | :large_orange_diamond: | :large_orange_diamond:  |
+| gfxrecon-optimize | :x: | :x: | :x: | :x: | :x: |
+| gfxrecon-tocpp | :x: | :x: | :x: | :x:  | :x: |
+
+**Legend**
+* :white_check_mark: : Supported
+* :x: : Not Supported
+* :large_orange_diamond: : Not supported on Android/Meta Quest, but Desktop tools support modifying the resulting captures
+* :construction: : Early Preview / Alpha / Beta
+
+### Cross-Platform Capture/Replay Support
+
+The table above only represents replay on the same platform and driver
+version on which the file was captured.
+
+It is possible in some circumstances to replay on one operating system a
+trace that was captured on another operating system.
+However this is not currently supported unless specified.
+
+For example, a Windows capture may replay on Linux, and vice versa,
+if:
+  * Certain settings are forced in the replay application
+     * Overriding the windowing system used
+     * Disabling unknown extensions
+     * Rebinding memory
+  * Compability libraries are enabled to expose operating system behavior
+     * Such as Wine.
+
+
+>>>>>>> README.md
 ## Building
 
 Instructions for building the contents of this repository can be found in
@@ -51,6 +142,15 @@ found at the following locations:
 * [Desktop Usage - D3D12](USAGE_desktop_D3D12.md)
 * [Android Usage](USAGE_android.md)
 
+<<<<<<< README.md
+=======
+## Testing
+
+In addition to unit tests, there are several [test apps](TESTING_test_apps.md) included that can 
+be used to verify GFXReconstruct output.  These test apps execute small graphics workloads which
+result in small, known .gfxr outputs.
+
+>>>>>>> README.md
 ## License
 
 This work is licensed under the terms of the MIT License; see
@@ -60,8 +160,14 @@ This work is licensed under the terms of the MIT License; see
 
 GFXReconstruct is a suite of tools intended for the purpose of
 improving application and platform quality by allowing the analysis
+<<<<<<< README.md
 of capture and replay of graphics command streams.  Use cases
 include, for example, regression testing, silicon and platform
 bringup, and reporting bugs.  Using GFXReconstruct to extract assets
+=======
+of capture and replay of graphics command streams. Use cases
+include, for example, regression testing, silicon and platform
+bringup, and reporting bugs. Using GFXReconstruct to extract assets
+>>>>>>> README.md
 from an application or game for which you don’t have an appropriate
 license may violate copyrights or software licenses.
diff --git a/TESTING_test_apps.md b/TESTING_test_apps.md
new file mode 100644
index 0000000..db62bf7
--- /dev/null
+++ b/TESTING_test_apps.md
@@ -0,0 +1,99 @@
+# GFXReconstruct Test Apps
+
+## **Adding a Test App**
+
+1. Create a new folder in the `test_apps` directory. Name the directory the same name as your test app.
+2. Add your code to the new folder
+3. Create a new `CMakeLists.txt` file in the new directory that builds your test app. For examples
+4. Include the new folder in the CMakeLists.txt file in the `test_apps` directory
+
+See the *triangle* test app for examples.
+
+## **Test App Architecture**
+
+The *gfxrecon::test::TestAppBase* class is provided as a base class for test apps. This base class provides basic Vulkan
+initialization and a render loop. The *TestAppBase* provides to following overridable virtual functions:
+
+* ***void configure_instance_builder(InstanceBuilder&)*** - called before instance creation in order to modify the
+  instance creation, e.g. add instance extensions
+* ***void configure_physical_device_selector(PhysicalDeviceSelector&)*** - called before physical device selection in
+  order to modify device selection
+* ***void configure_device_builder(DeviceBuilder&, PhysicalDevice const&)*** - called before device creation in order to
+  modify device creation, e.g. add device extensions
+* ***void configure_swapchain_builder(SwapchainBuilder&)*** - called before swapchain creation in order to modify
+  swapchain creation
+* ***void setup()*** - called after the swapchain has been built, but before the render loop. Can be used to setup test
+  app specific resources
+* ***bool frame(const int frame_num)*** - executes a single frame of the render loop. Returns true to continue the
+  render loop, false to exit
+* ***void cleanup()*** -- called after the render loop has stopped. Can be used to cleanup test app specific resources
+
+Only the ***frame*** function is required. All others are optional.
+
+## **Test Launcher**
+
+The test-launcher is an executable which can be used to launch test apps.
+
+```console
+gfxrecon-test-launcher - A launcher for GFXReconstruct test apps.
+
+Usage:
+  gfxrecon-test-launcher [-h | --help] <test_name>
+
+Required arguments:
+  <test_name>   Name of the test app to launch.
+                Options are: 
+                  acquired-image
+                  host-image-copy
+                  multisample-depth
+                  pipeline-binaries
+                  shader-objects
+                  sparse-resources
+                  triangle
+                  external-memory-fd-export
+                  external-memory-fd-import
+                  wait-for-present
+                  [...]
+```
+
+Use of the *TestAppBase* is required to add a test app to the test-launcher.
+
+In order to add a test app to the test-launcher, make sure to modify `test_launcher.cpp` using the following approach making sure to replace `<test-name>` with the name of your test app:
+1. Add `#include <<test-name>-app.h>`
+2. Add `"<test-name>"` to `kAppNames`
+3. Add the following code to `CreateTestApp()`:
+   ```cpp
+   else if (app_name == "<test-name>")
+   {
+       app = std::make_unique<gfxrecon::test_app::<test_name>::App>();
+   }
+   ```
+
+Finally, make sure to add your test app library to the `GFXRECON_TEST_LAUNCHER_LINK_LIBRARIES` list in the following CMakeLists files:
+
+- `android/test/test_apps/launcher/CMakeLists.txt`
+- `test/test_apps/launcher/CMakeLists.txt`
+
+## **Building Test Apps**
+
+Test apps are built as part of the default build CMAKE build process. In order to stop test apps from building, set the
+**GFXRECON_INCLUDE_TEST_APPS** CMake variable to OFF, e.g. provide `-DGFXRECON_INCLUDE_TEST_APPS=OFF` in your cmake command line.
+
+## **Test App Verification**
+
+To run the test apps and validate output against known good '.gfxr' files, build the project and then run the test script from within the 'test' install directory.
+
+*On Windows:* The test app must not be run as administrator.  If you receive an error that the ps1 script is not digitally signed, you will need to run 'Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope LocalMachine' to allow the script to run.
+
+
+|Operating System| ./scripts/build.py Test Directory  |Test Script|
+|---------------|------------------------------------|------------|
+|Windows| build/windows/x64/output/test      |run-tests.ps1|
+|Linux| build/linux/x64/output/test        |run-tests.sh|
+|macOS| build/darwin/universal/output/test |run-tests_macos.sh|
+
+## **Run A Single Test App**
+
+The default of Test Script `run-tests.sh` runs whole test apps. It could also run a single test app by specifying the test name, e.g. `run-tests.sh triangle`.
+
+It could also run the test app straightforwardly without the test script. However, many environment variables set in the test script are necessary for running a single test app. Plus, some paths of the environment variables might have to be modified to match your environment.
diff --git a/android/build.gradle b/android/build.gradle
index 3846962..fabd0ec 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -7,7 +7,11 @@ buildscript {
         jcenter()
     }
     dependencies {
+<<<<<<< android/build.gradle
         classpath 'com.android.tools.build:gradle:4.1.1'
+=======
+        classpath 'com.android.tools.build:gradle:8.1.2'
+>>>>>>> android/build.gradle
 
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/android/framework/application-multi-win/CMakeLists.txt b/android/framework/application-multi-win/CMakeLists.txt
new file mode 100644
index 0000000..2352d0f
--- /dev/null
+++ b/android/framework/application-multi-win/CMakeLists.txt
@@ -0,0 +1,37 @@
+add_library(gfxrecon_application_multiwin STATIC "")
+
+target_compile_definitions(gfxrecon_application_multiwin
+                            PUBLIC
+                                GFXR_MULTI_WINDOW_REPLAY=1
+                          )
+
+target_sources(gfxrecon_application_multiwin
+               PUBLIC
+                   ${GFXRECON_SOURCE_DIR}/framework/application/android_context.h
+                   ${GFXRECON_SOURCE_DIR}/framework/application/android_context.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/application/android_window.h
+                   ${GFXRECON_SOURCE_DIR}/framework/application/android_window.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/application/application.h
+                   ${GFXRECON_SOURCE_DIR}/framework/application/application.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/application/wsi_context.h
+                   ${GFXRECON_SOURCE_DIR}/framework/application/wsi_context.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/application/android_jni.cpp
+              )
+
+if (OPENXR_SUPPORT_ENABLED)
+    target_include_directories(gfxrecon_application_multiwin PUBLIC ${GFXRECON_SOURCE_DIR}/external/OpenXR-SDK/include)
+    target_compile_definitions(gfxrecon_application_multiwin PUBLIC ENABLE_OPENXR_SUPPORT=1)
+endif()
+
+target_include_directories(gfxrecon_application_multiwin
+                           PUBLIC
+                               ${GFXRECON_SOURCE_DIR}/framework)
+
+target_link_libraries(gfxrecon_application_multiwin
+                      gfxrecon_decode
+                      gfxrecon_graphics
+                      gfxrecon_format
+                      gfxrecon_util
+                      native_app_glue
+                      vulkan_registry
+                      platform_specific)
diff --git a/android/framework/application/CMakeLists.txt b/android/framework/application/CMakeLists.txt
index cacd4a1..c2a716e 100644
--- a/android/framework/application/CMakeLists.txt
+++ b/android/framework/application/CMakeLists.txt
@@ -1,7 +1,11 @@
 add_library(gfxrecon_application STATIC "")
 
 target_sources(gfxrecon_application
+<<<<<<< android/framework/application/CMakeLists.txt
                PRIVATE
+=======
+               PUBLIC
+>>>>>>> android/framework/application/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/application/android_context.h
                    ${GFXRECON_SOURCE_DIR}/framework/application/android_context.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/application/android_window.h
@@ -10,17 +14,35 @@ target_sources(gfxrecon_application
                    ${GFXRECON_SOURCE_DIR}/framework/application/application.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/application/wsi_context.h
                    ${GFXRECON_SOURCE_DIR}/framework/application/wsi_context.cpp
+<<<<<<< android/framework/application/CMakeLists.txt
               )
 
 target_include_directories(gfxrecon_application
                            PUBLIC
                                ${GFXRECON_SOURCE_DIR}/framework
                                ${ANDROID_NDK}/sources/android/native_app_glue)
+=======
+                   ${GFXRECON_SOURCE_DIR}/framework/application/android_jni.cpp
+              )
+
+if (OPENXR_SUPPORT_ENABLED)
+    target_include_directories(gfxrecon_application PUBLIC ${GFXRECON_SOURCE_DIR}/external/OpenXR-SDK/include)
+    target_compile_definitions(gfxrecon_application PUBLIC ENABLE_OPENXR_SUPPORT=1)
+endif()
+
+target_include_directories(gfxrecon_application
+                           PUBLIC
+                               ${GFXRECON_SOURCE_DIR}/framework)
+>>>>>>> android/framework/application/CMakeLists.txt
 
 target_link_libraries(gfxrecon_application
                       gfxrecon_decode
                       gfxrecon_graphics
                       gfxrecon_format
                       gfxrecon_util
+<<<<<<< android/framework/application/CMakeLists.txt
+=======
+                      native_app_glue
+>>>>>>> android/framework/application/CMakeLists.txt
                       vulkan_registry
                       platform_specific)
diff --git a/android/framework/cmake-config/PlatformConfig.cmake b/android/framework/cmake-config/PlatformConfig.cmake
index 65d9bd4..b261a74 100644
--- a/android/framework/cmake-config/PlatformConfig.cmake
+++ b/android/framework/cmake-config/PlatformConfig.cmake
@@ -1,12 +1,29 @@
+<<<<<<< android/framework/cmake-config/PlatformConfig.cmake
 set(CMAKE_CXX_STANDARD 17)
 set(CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_MODULE_PATH "${GFXRECON_SOURCE_DIR}/external/cmake-modules")
+=======
+set(CMAKE_CXX_STANDARD 20)
+set(CXX_STANDARD_REQUIRED ON)
+
+# because the NDK sets CMAKE_FIND_ROOT_PATH_MODE_*  to ONLY, it ignores
+# us setting CMAKE_PREFIX_PATH.  So just set the package DIR directly.
+set(nlohmann_json_DIR "${GFXRECON_SOURCE_DIR}/external/nlohmann-json/share/cmake/nlohmann_json")
+find_package(nlohmann_json REQUIRED CONFIG PATHS "${nlohmann_json_DIR}" NO_DEFAULT_PATH)
+
+set(CMAKE_MODULE_PATH "${GFXRECON_SOURCE_DIR}/external/cmake-modules")
+list(APPEND CMAKE_MODULE_PATH "${GFXRECON_SOURCE_DIR}/cmake")
+>>>>>>> android/framework/cmake-config/PlatformConfig.cmake
 
 # Version info
 set(GFXRECONSTRUCT_PROJECT_VERSION_MAJOR 1)
 set(GFXRECONSTRUCT_PROJECT_VERSION_MINOR 0)
+<<<<<<< android/framework/cmake-config/PlatformConfig.cmake
 set(GFXRECONSTRUCT_PROJECT_VERSION_PATCH 4)
+=======
+set(GFXRECONSTRUCT_PROJECT_VERSION_PATCH 5)
+>>>>>>> android/framework/cmake-config/PlatformConfig.cmake
 
 set(GFXRECON_PROJECT_VERSION_DESIGNATION "-unknown")
 set(GFXRECON_PROJECT_VERSION_SHA1 "unknown-build-source")
@@ -55,12 +72,48 @@ file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/project_version_$<CONFIG>.h" INPUT "${
 # Since project_version_$<CONFIG>.h differs per build, set a compiler definition that files can use to include it
 add_definitions(-DPROJECT_VERSION_HEADER_FILE="project_version_$<CONFIG>.h")
 
+<<<<<<< android/framework/cmake-config/PlatformConfig.cmake
 add_library(platform_specific INTERFACE)
 target_compile_definitions(platform_specific INTERFACE _FILE_OFFSET_BITS=64 PAGE_GUARD_ENABLE_UCONTEXT_WRITE_DETECTION VK_USE_PLATFORM_ANDROID_KHR)
+=======
+# Isolate the repo SHA in a library to reduce the amount of recompilation on git commit, checkout, etc.
+# Clients should #include PROJECT_VERSION_HEADER_FILE and call GetProjectVersionString()
+configure_file("${GFXRECON_SOURCE_DIR}/project_version_string.h.in" "${CMAKE_BINARY_DIR}/project_version_string.h")
+add_library(project_version "${GFXRECON_SOURCE_DIR}/project_version.cpp")
+target_include_directories(project_version PUBLIC "${CMAKE_BINARY_DIR}")
+
+add_library(platform_specific INTERFACE)
+target_compile_definitions(platform_specific INTERFACE
+                                _FILE_OFFSET_BITS=64
+                                PAGE_GUARD_ENABLE_UCONTEXT_WRITE_DETECTION
+                                VK_USE_PLATFORM_ANDROID_KHR
+                                XR_USE_PLATFORM_ANDROID
+                                XR_USE_GRAPHICS_API_VULKAN)
+>>>>>>> android/framework/cmake-config/PlatformConfig.cmake
 
 add_library(vulkan_registry INTERFACE)
 target_include_directories(vulkan_registry INTERFACE ${GFXRECON_SOURCE_DIR}/external/Vulkan-Headers/include)
 target_compile_definitions(vulkan_registry INTERFACE VK_NO_PROTOTYPES VK_ENABLE_BETA_EXTENSIONS)
 
+<<<<<<< android/framework/cmake-config/PlatformConfig.cmake
 add_library(vulkan_memory_allocator INTERFACE)
 target_include_directories(vulkan_memory_allocator INTERFACE ${GFXRECON_SOURCE_DIR}/external/VulkanMemoryAllocator/include)
+=======
+add_library(spirv_registry INTERFACE)
+target_include_directories(spirv_registry INTERFACE ${GFXRECON_SOURCE_DIR}/external/SPIRV-Headers/include)
+
+add_library(vulkan_memory_allocator INTERFACE)
+target_include_directories(vulkan_memory_allocator INTERFACE ${GFXRECON_SOURCE_DIR}/external/VulkanMemoryAllocator/include)
+
+# SPIRV-Reflect included as submodule -> libspirv-reflect-static.a
+set(SPIRV_REFLECT_EXAMPLES OFF CACHE INTERNAL "no spirv_reflect samples" FORCE)
+set(SPIRV_REFLECT_EXECUTABLE OFF CACHE INTERNAL "no spirv_reflect executables" FORCE)
+set(SPIRV_REFLECT_STATIC_LIB ON CACHE INTERNAL "create spirv-reflect-static library" FORCE)
+set(CMAKE_POLICY_DEFAULT_CMP0077 NEW CACHE INTERNAL "set a cmake policy for spirv_reflect" FORCE)
+add_subdirectory("${GFXRECON_SOURCE_DIR}/external/SPIRV-Reflect" EXCLUDE_FROM_ALL "${CMAKE_BINARY_DIR}/external/SPIRV-Reflect")
+include_directories("${GFXRECON_SOURCE_DIR}/external/SPIRV-Reflect")
+
+# Export ANativeActivity_onCreate(),
+# Refer to: https://github.com/android-ndk/ndk/issues/381.
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_onCreate")
+>>>>>>> android/framework/cmake-config/PlatformConfig.cmake
diff --git a/android/framework/decode/CMakeLists.txt b/android/framework/decode/CMakeLists.txt
index c8e2d01..04868c1 100644
--- a/android/framework/decode/CMakeLists.txt
+++ b/android/framework/decode/CMakeLists.txt
@@ -4,8 +4,29 @@ target_sources(gfxrecon_decode
                PRIVATE
                    ${GFXRECON_SOURCE_DIR}/framework/decode/annotation_handler.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/api_decoder.h
+<<<<<<< android/framework/decode/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/decode/common_consumer_base.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/copy_shaders.h
+=======
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/api_payload.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/block_buffer.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/block_buffer.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/block_parser.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/block_parser.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/common_consumer_base.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/common_handle_mapping_util.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/common_object_info_table.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/common_struct_handle_mappers.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/common_object_info_table.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/copy_shaders.h
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/custom_openxr_struct_decoders.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/custom_openxr_struct_decoders.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/custom_openxr_struct_decoders_forward.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/custom_openxr_struct_handle_mappers.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/custom_openxr_struct_handle_mappers.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/custom_openxr_struct_to_json.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/custom_openxr_struct_to_json.cpp>
+>>>>>>> android/framework/decode/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/decode/custom_vulkan_struct_decoders.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/custom_vulkan_struct_decoders.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/decode/custom_vulkan_struct_decoders_forward.h
@@ -17,9 +38,53 @@ target_sources(gfxrecon_decode
                    ${GFXRECON_SOURCE_DIR}/framework/decode/descriptor_update_template_decoder.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/decode/file_processor.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/file_processor.cpp
+<<<<<<< android/framework/decode/CMakeLists.txt
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/file_transformer.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/file_transformer.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/handle_pointer_decoder.h
+=======
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/preload_file_processor.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/preload_file_processor.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/decode/file_transformer.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/file_transformer.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/decode/handle_pointer_decoder.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/json_writer.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/json_writer.cpp
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_consumer_base.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_decoder_base.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_decoder_base.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_detection_consumer.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_enum_util.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_feature_util.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_feature_util.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_handle_mapping_util.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_handle_mapping_util.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_json_consumer_base.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_json_consumer_base.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_next_node.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_next_typed_node.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_object_info.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_object_info_table_base.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_replay_common_state.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_replay_session_state.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_replay_session_state.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_replay_swapchain_state.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_replay_swapchain_state.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_replay_consumer_base.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_replay_consumer_base.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_replay_options.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_resource_tracking_consumer.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_resource_tracking_consumer.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_stats_consumer.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_tracked_object_info.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_tracked_object_info_table.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_tracked_object_info.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_tracked_object_info_table.cpp>
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/mark_injected_commands.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/mark_injected_commands.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/parsed_block.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/parsed_block.cpp
+>>>>>>> android/framework/decode/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/decode/pointer_decoder_base.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/pointer_decoder.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/portability.h
@@ -45,11 +110,22 @@ target_sources(gfxrecon_decode
                    ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_decoder_base.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_default_allocator.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_default_allocator.cpp
+<<<<<<< android/framework/decode/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_captured_swapchain.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_captured_swapchain.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_enum_util.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_feature_util.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_feature_util.cpp
+=======
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_address_replacer.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_address_replacer.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_address_replacer_shaders.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_device_address_tracker.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_device_address_tracker.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_captured_swapchain.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_captured_swapchain.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_enum_util.h
+>>>>>>> android/framework/decode/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_handle_mapping_util.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_handle_mapping_util.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_object_cleanup_util.h
@@ -70,6 +146,22 @@ target_sources(gfxrecon_decode
                    ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_replay_consumer_base.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_replay_consumer_base.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_replay_options.h
+<<<<<<< android/framework/decode/CMakeLists.txt
+=======
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_pre_process_consumer.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_replay_dump_resources.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_replay_dump_resources.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_replay_dump_resources_common.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_replay_dump_resources_common.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_replay_dump_resources_draw_calls.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_replay_dump_resources_draw_calls.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_replay_dump_resources_compute_ray_tracing.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_replay_dump_resources_compute_ray_tracing.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_replay_dump_resources_delegate.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_replay_dump_resources_delegate.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_replay_dump_resources_json.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_replay_dump_resources_json.cpp
+>>>>>>> android/framework/decode/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_resource_allocator.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_resource_initializer.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_resource_initializer.cpp
@@ -86,17 +178,47 @@ target_sources(gfxrecon_decode
                    ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_offscreen_swapchain.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_offscreen_swapchain.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/decode/window.h
+<<<<<<< android/framework/decode/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_consumer.h
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_decoder.h
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_decoder.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_feature_util.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_replay_consumer.h
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_replay_consumer.cpp
+=======
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_consumer.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_decoder.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_decoder.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_enum_to_json.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_enum_to_json.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_json_consumer.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_json_consumer.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_object_info_table.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_replay_consumer.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_replay_consumer.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_struct_decoders.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_struct_decoders.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_struct_decoders_forward.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_struct_handle_mappers.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_struct_handle_mappers.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_struct_next_decoder.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_struct_to_json.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_struct_to_json.cpp>
+                   ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_consumer.h
+                   ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_decoder.h
+                   ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_decoder.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_pnext_struct_decoder.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_replay_consumer.h
+                   ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_replay_consumer.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_replay_dump_resources.h
+                   ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_replay_dump_resources.cpp
+>>>>>>> android/framework/decode/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_struct_decoders_forward.h
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_struct_decoders.h
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_struct_decoders.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_struct_handle_mappers.h
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_struct_handle_mappers.cpp
+<<<<<<< android/framework/decode/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_decode_pnext_struct.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_object_info_table_base2.h
               )
@@ -106,3 +228,27 @@ target_include_directories(gfxrecon_decode
                                ${GFXRECON_SOURCE_DIR}/framework)
 
 target_link_libraries(gfxrecon_decode gfxrecon_graphics gfxrecon_format gfxrecon_util vulkan_registry vulkan_memory_allocator platform_specific)
+=======
+                   ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_object_info_table_base2.h
+              )
+
+if (OPENXR_SUPPORT_ENABLED)
+    target_include_directories(gfxrecon_decode PUBLIC ${GFXRECON_SOURCE_DIR}/external/OpenXR-SDK/include)
+    target_compile_definitions(gfxrecon_decode PUBLIC ENABLE_OPENXR_SUPPORT=1)
+endif()
+
+target_include_directories(gfxrecon_decode
+                           PUBLIC
+                               ${CMAKE_BINARY_DIR}
+                               ${GFXRECON_SOURCE_DIR}/framework
+                               ${GFXRECON_SOURCE_DIR}/external/precompiled/android/include)
+
+target_link_libraries(gfxrecon_decode
+                      gfxrecon_graphics
+                      gfxrecon_format
+                      gfxrecon_util
+                      vulkan_registry
+                      vulkan_memory_allocator
+                      platform_specific
+                      spirv-reflect-static)
+>>>>>>> android/framework/decode/CMakeLists.txt
diff --git a/android/framework/encode/CMakeLists.txt b/android/framework/encode/CMakeLists.txt
index cace824..7750f22 100644
--- a/android/framework/encode/CMakeLists.txt
+++ b/android/framework/encode/CMakeLists.txt
@@ -8,6 +8,18 @@ target_sources(gfxrecon_encode
                    ${GFXRECON_SOURCE_DIR}/framework/encode/capture_manager.cpp               
                    ${GFXRECON_SOURCE_DIR}/framework/encode/capture_settings.h
                    ${GFXRECON_SOURCE_DIR}/framework/encode/capture_settings.cpp
+<<<<<<< android/framework/encode/CMakeLists.txt
+=======
+                   ${GFXRECON_SOURCE_DIR}/framework/encode/command_writer.h
+                   ${GFXRECON_SOURCE_DIR}/framework/encode/command_writer.cpp
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/encode/custom_openxr_encoder_commands.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/encode/custom_openxr_api_call_encoders.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/encode/custom_openxr_api_call_encoders.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/encode/custom_openxr_struct_encoders.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/encode/custom_openxr_struct_encoders.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/encode/custom_openxr_struct_handle_wrappers.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/encode/custom_openxr_struct_handle_wrappers.cpp>
+>>>>>>> android/framework/encode/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/encode/custom_vulkan_encoder_commands.h
                    ${GFXRECON_SOURCE_DIR}/framework/encode/custom_vulkan_api_call_encoders.h
                    ${GFXRECON_SOURCE_DIR}/framework/encode/custom_vulkan_api_call_encoders.cpp
@@ -17,6 +29,21 @@ target_sources(gfxrecon_encode
                    ${GFXRECON_SOURCE_DIR}/framework/encode/custom_vulkan_struct_encoders.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/encode/custom_vulkan_struct_handle_wrappers.h
                    ${GFXRECON_SOURCE_DIR}/framework/encode/custom_vulkan_struct_handle_wrappers.cpp
+<<<<<<< android/framework/encode/CMakeLists.txt
+=======
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/encode/openxr_capture_manager.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/encode/openxr_capture_manager.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/encode/openxr_handle_wrappers.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/encode/openxr_handle_wrapper_util.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/encode/openxr_handle_wrapper_util.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/encode/openxr_state_info.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/encode/openxr_state_table_base.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/encode/openxr_state_tracker.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/encode/openxr_state_tracker_initializers.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/encode/openxr_state_tracker.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/encode/openxr_state_writer.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/encode/openxr_state_writer.cpp>
+>>>>>>> android/framework/encode/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/encode/descriptor_update_template_info.h
                    ${GFXRECON_SOURCE_DIR}/framework/encode/handle_unwrap_memory.h
                    ${GFXRECON_SOURCE_DIR}/framework/encode/parameter_buffer.h
@@ -24,8 +51,20 @@ target_sources(gfxrecon_encode
                    ${GFXRECON_SOURCE_DIR}/framework/encode/scoped_destroy_lock.h
                    ${GFXRECON_SOURCE_DIR}/framework/encode/scoped_destroy_lock.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/encode/struct_pointer_encoder.h
+<<<<<<< android/framework/encode/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/encode/vulkan_capture_manager.h
                    ${GFXRECON_SOURCE_DIR}/framework/encode/vulkan_capture_manager.cpp
+=======
+                   ${GFXRECON_SOURCE_DIR}/framework/encode/vulkan_acceleration_structure_build_state.h
+                   ${GFXRECON_SOURCE_DIR}/framework/encode/vulkan_capture_layer_settings.h
+                   ${GFXRECON_SOURCE_DIR}/framework/encode/vulkan_capture_layer_settings.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/encode/vulkan_capture_manager.h
+                   ${GFXRECON_SOURCE_DIR}/framework/encode/vulkan_capture_manager.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/encode/vulkan_device_address_tracker.h
+                   ${GFXRECON_SOURCE_DIR}/framework/encode/vulkan_device_address_tracker.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/encode/vulkan_entry_base.h
+                   ${GFXRECON_SOURCE_DIR}/framework/encode/vulkan_entry_base.cpp
+>>>>>>> android/framework/encode/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/encode/vulkan_handle_wrappers.h
                    ${GFXRECON_SOURCE_DIR}/framework/encode/vulkan_handle_wrapper_util.h
                    ${GFXRECON_SOURCE_DIR}/framework/encode/vulkan_handle_wrapper_util.cpp
@@ -35,24 +74,57 @@ target_sources(gfxrecon_encode
                    ${GFXRECON_SOURCE_DIR}/framework/encode/vulkan_state_tracker.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/encode/vulkan_state_writer.h
                    ${GFXRECON_SOURCE_DIR}/framework/encode/vulkan_state_writer.cpp
+<<<<<<< android/framework/encode/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_encode_pnext_struct.cpp
+=======
+                   ${GFXRECON_SOURCE_DIR}/framework/encode/vulkan_track_struct.h
+                   ${GFXRECON_SOURCE_DIR}/framework/encode/vulkan_capture_common.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/encode/vulkan_capture_common.h
+>>>>>>> android/framework/encode/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_api_call_encoders.h
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_api_call_encoders.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_command_buffer_util.h
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_command_buffer_util.cpp
+<<<<<<< android/framework/encode/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_dispatch_table.h
+=======
+                   ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_pnext_struct_encoder.cpp
+>>>>>>> android/framework/encode/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_struct_encoders.h
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_struct_encoders.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_struct_handle_wrappers.h
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_struct_handle_wrappers.cpp
+<<<<<<< android/framework/encode/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_struct_trackers.h
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_struct_trackers.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_state_table.h
               )
 
+=======
+                   ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_state_table.h
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_api_call_encoders.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_api_call_encoders.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_struct_encoders.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_struct_encoders.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_struct_handle_wrappers.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_struct_handle_wrappers.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_struct_next_encoder.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_state_table.h>
+              )
+
+if (OPENXR_SUPPORT_ENABLED)
+    target_include_directories(gfxrecon_encode PUBLIC ${GFXRECON_SOURCE_DIR}/external/OpenXR-SDK/include)
+    target_compile_definitions(gfxrecon_encode PUBLIC ENABLE_OPENXR_SUPPORT=1)
+endif()
+
+>>>>>>> android/framework/encode/CMakeLists.txt
 target_include_directories(gfxrecon_encode
                            PUBLIC
                                ${CMAKE_BINARY_DIR}
                                ${GFXRECON_SOURCE_DIR}/framework)
 
+<<<<<<< android/framework/encode/CMakeLists.txt
 target_link_libraries(gfxrecon_encode gfxrecon_graphics gfxrecon_format gfxrecon_util vulkan_registry platform_specific android)
+=======
+target_link_libraries(gfxrecon_encode gfxrecon_graphics gfxrecon_format gfxrecon_util vulkan_registry platform_specific project_version android)
+>>>>>>> android/framework/encode/CMakeLists.txt
diff --git a/android/framework/format/CMakeLists.txt b/android/framework/format/CMakeLists.txt
index 65a2ea5..70307d7 100644
--- a/android/framework/format/CMakeLists.txt
+++ b/android/framework/format/CMakeLists.txt
@@ -7,8 +7,19 @@ target_sources(gfxrecon_format
                    ${GFXRECON_SOURCE_DIR}/framework/format/format_util.h
                    ${GFXRECON_SOURCE_DIR}/framework/format/format_util.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/format/platform_types.h
+<<<<<<< android/framework/format/CMakeLists.txt
               )
 
+=======
+                   ${GFXRECON_SOURCE_DIR}/framework/format/platform_types_d3d_overrides.h
+              )
+
+if (OPENXR_SUPPORT_ENABLED)
+    target_include_directories(gfxrecon_format PUBLIC ${GFXRECON_SOURCE_DIR}/external/OpenXR-SDK/include)
+    target_compile_definitions(gfxrecon_format PUBLIC ENABLE_OPENXR_SUPPORT=1)
+endif()
+
+>>>>>>> android/framework/format/CMakeLists.txt
 target_include_directories(gfxrecon_format
                            PUBLIC
                                ${GFXRECON_SOURCE_DIR}/framework)
diff --git a/android/framework/graphics/CMakeLists.txt b/android/framework/graphics/CMakeLists.txt
index fd8e97c..f7dfecb 100644
--- a/android/framework/graphics/CMakeLists.txt
+++ b/android/framework/graphics/CMakeLists.txt
@@ -4,17 +4,48 @@ target_sources(gfxrecon_graphics
                PRIVATE
                     ${GFXRECON_SOURCE_DIR}/framework/graphics/fps_info.h
                     ${GFXRECON_SOURCE_DIR}/framework/graphics/fps_info.cpp
+<<<<<<< android/framework/graphics/CMakeLists.txt
                     ${GFXRECON_SOURCE_DIR}/framework/graphics/vulkan_device_util.h
                     ${GFXRECON_SOURCE_DIR}/framework/graphics/vulkan_device_util.cpp
+=======
+                    ${GFXRECON_SOURCE_DIR}/framework/graphics/vulkan_check_buffer_references.h
+                    ${GFXRECON_SOURCE_DIR}/framework/graphics/vulkan_check_buffer_references.cpp
+                    ${GFXRECON_SOURCE_DIR}/framework/graphics/vulkan_device_util.h
+                    ${GFXRECON_SOURCE_DIR}/framework/graphics/vulkan_device_util.cpp
+                    ${GFXRECON_SOURCE_DIR}/framework/graphics/vulkan_instance_util.h
+                    ${GFXRECON_SOURCE_DIR}/framework/graphics/vulkan_instance_util.cpp
+>>>>>>> android/framework/graphics/CMakeLists.txt
                     ${GFXRECON_SOURCE_DIR}/framework/graphics/vulkan_resources_util.h
                     ${GFXRECON_SOURCE_DIR}/framework/graphics/vulkan_resources_util.cpp
                     ${GFXRECON_SOURCE_DIR}/framework/graphics/vulkan_util.h
                     ${GFXRECON_SOURCE_DIR}/framework/graphics/vulkan_util.cpp
+<<<<<<< android/framework/graphics/CMakeLists.txt
               )
 
 target_include_directories(gfxrecon_graphics
                            PUBLIC
                                ${GFXRECON_SOURCE_DIR}/external/nlohmann/include
+=======
+                    ${GFXRECON_SOURCE_DIR}/framework/graphics/vulkan_feature_util.h
+                    ${GFXRECON_SOURCE_DIR}/framework/graphics/vulkan_feature_util.cpp
+                    ${GFXRECON_SOURCE_DIR}/framework/graphics/vulkan_struct_deep_copy.h
+                    ${GFXRECON_SOURCE_DIR}/framework/graphics/vulkan_struct_get_pnext.h
+                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_dispatch_table.h
+                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_struct_deep_copy.cpp
+                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_struct_deep_copy_stype.cpp
+                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_feature_util.cpp
+                    ${GFXRECON_SOURCE_DIR}/framework/graphics/vulkan_struct_extract_handles.h
+                    ${GFXRECON_SOURCE_DIR}/framework/graphics/vulkan_struct_extract_handles.cpp
+              )
+
+if (OPENXR_SUPPORT_ENABLED)
+    target_include_directories(gfxrecon_graphics PUBLIC ${GFXRECON_SOURCE_DIR}/external/OpenXR-SDK/include)
+    target_compile_definitions(gfxrecon_graphics PUBLIC ENABLE_OPENXR_SUPPORT=1)
+endif()
+
+target_include_directories(gfxrecon_graphics
+                           PUBLIC
+>>>>>>> android/framework/graphics/CMakeLists.txt
                                ${GFXRECON_SOURCE_DIR}/external
                                ${GFXRECON_SOURCE_DIR}/framework)
 
diff --git a/android/framework/util/CMakeLists.txt b/android/framework/util/CMakeLists.txt
index fb0e712..fa2b077 100644
--- a/android/framework/util/CMakeLists.txt
+++ b/android/framework/util/CMakeLists.txt
@@ -1,22 +1,63 @@
+<<<<<<< android/framework/util/CMakeLists.txt
+=======
+
+add_library(native_app_glue STATIC
+            ${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c)
+
+target_include_directories(native_app_glue
+                           PUBLIC
+                               ${ANDROID_NDK}/sources/android/native_app_glue)
+
+>>>>>>> android/framework/util/CMakeLists.txt
 add_library(gfxrecon_util STATIC "")
 
 target_sources(gfxrecon_util
                PRIVATE
+<<<<<<< android/framework/util/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/util/argument_parser.h
                    ${GFXRECON_SOURCE_DIR}/framework/util/argument_parser.cpp
+=======
+                   ${GFXRECON_SOURCE_DIR}/framework/util/android/activity.h
+                   ${GFXRECON_SOURCE_DIR}/framework/util/android/activity.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/util/android/intent.h
+                   ${GFXRECON_SOURCE_DIR}/framework/util/android/intent.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/util/alignment_utils.h
+                   ${GFXRECON_SOURCE_DIR}/framework/util/argument_parser.h
+                   ${GFXRECON_SOURCE_DIR}/framework/util/argument_parser.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/util/buffer_writer.h
+                   ${GFXRECON_SOURCE_DIR}/framework/util/buffer_writer.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/util/clock_cache.h
+>>>>>>> android/framework/util/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/util/compressor.h
                    ${GFXRECON_SOURCE_DIR}/framework/util/date_time.h
                    ${GFXRECON_SOURCE_DIR}/framework/util/date_time.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/util/defines.h
+<<<<<<< android/framework/util/CMakeLists.txt
+=======
+                   ${GFXRECON_SOURCE_DIR}/framework/util/file_input_stream.h
+                   ${GFXRECON_SOURCE_DIR}/framework/util/file_input_stream.cpp
+>>>>>>> android/framework/util/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/util/file_output_stream.h
                    ${GFXRECON_SOURCE_DIR}/framework/util/file_output_stream.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/util/file_path.h
                    ${GFXRECON_SOURCE_DIR}/framework/util/file_path.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/util/hash.h
+<<<<<<< android/framework/util/CMakeLists.txt
+                   ${GFXRECON_SOURCE_DIR}/framework/util/image_writer.h
+                   ${GFXRECON_SOURCE_DIR}/framework/util/image_writer.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/util/keyboard.h
+                   ${GFXRECON_SOURCE_DIR}/framework/util/keyboard.cpp
+=======
+                   ${GFXRECON_SOURCE_DIR}/framework/util/heap_buffer.h
+                   ${GFXRECON_SOURCE_DIR}/framework/util/heap_buffer.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/util/image_writer.h
                    ${GFXRECON_SOURCE_DIR}/framework/util/image_writer.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/util/json_util.h
+                   ${GFXRECON_SOURCE_DIR}/framework/util/json_util.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/util/keyboard.h
                    ${GFXRECON_SOURCE_DIR}/framework/util/keyboard.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/util/linear_hashmap.h
+>>>>>>> android/framework/util/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/util/logging.h
                    ${GFXRECON_SOURCE_DIR}/framework/util/logging.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/util/lz4_compressor.h
@@ -35,12 +76,32 @@ target_sources(gfxrecon_util
                    ${GFXRECON_SOURCE_DIR}/framework/util/platform.h
                    ${GFXRECON_SOURCE_DIR}/framework/util/settings_loader.h
                    ${GFXRECON_SOURCE_DIR}/framework/util/settings_loader.cpp
+<<<<<<< android/framework/util/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/util/strings.h
                    ${GFXRECON_SOURCE_DIR}/framework/util/strings.cpp
+=======
+                   ${GFXRECON_SOURCE_DIR}/framework/util/span.h
+                   ${GFXRECON_SOURCE_DIR}/framework/util/spirv_helper.h
+                   ${GFXRECON_SOURCE_DIR}/framework/util/spirv_parsing_util.h
+                   ${GFXRECON_SOURCE_DIR}/framework/util/spirv_parsing_util.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/util/strings.h
+                   ${GFXRECON_SOURCE_DIR}/framework/util/strings.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/util/thread_data.h
+                   ${GFXRECON_SOURCE_DIR}/framework/util/thread_data.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/util/type_traits_extras.h
+                   ${GFXRECON_SOURCE_DIR}/framework/util/to_string.h
+                   ${GFXRECON_SOURCE_DIR}/framework/util/to_string.cpp
+>>>>>>> android/framework/util/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/util/options.h
                    ${GFXRECON_SOURCE_DIR}/framework/util/options.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/util/zstd_compressor.h
                    ${GFXRECON_SOURCE_DIR}/framework/util/zstd_compressor.cpp
+<<<<<<< android/framework/util/CMakeLists.txt
+=======
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_enum_to_string.h>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_enum_to_string.cpp>
+                   $<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/generated/generated_openxr_type_util.h>
+>>>>>>> android/framework/util/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_enum_to_string.h
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_enum_to_string.cpp
               )
@@ -54,13 +115,36 @@ target_compile_definitions(gfxrecon_util
 
 target_include_directories(gfxrecon_util
                            PUBLIC
+<<<<<<< android/framework/util/CMakeLists.txt
+=======
+                               ${ANDROID_NDK}/sources/android/native_app_glue
+>>>>>>> android/framework/util/CMakeLists.txt
                                ${GFXRECON_SOURCE_DIR}/external/precompiled/android/include
                                ${GFXRECON_SOURCE_DIR}/external/stb
                                ${GFXRECON_SOURCE_DIR}/framework)
 
+<<<<<<< android/framework/util/CMakeLists.txt
 target_link_libraries(gfxrecon_util
                           platform_specific
                           vulkan_registry
                           ${GFXRECON_SOURCE_DIR}/external/precompiled/android/lib/${ANDROID_ABI}/liblz4_static.a
                           ${GFXRECON_SOURCE_DIR}/external/precompiled/android/lib/${ANDROID_ABI}/libzstd.a
                           z)
+=======
+if (OPENXR_SUPPORT_ENABLED)
+    target_include_directories(gfxrecon_util PUBLIC ${GFXRECON_SOURCE_DIR}/external/OpenXR-SDK/include)
+    target_compile_definitions(gfxrecon_util PUBLIC ENABLE_OPENXR_SUPPORT=1)
+endif()
+
+target_link_libraries(gfxrecon_util
+                      platform_specific
+                      vulkan_registry
+                      spirv_registry
+                      spirv-reflect-static
+                      nlohmann_json::nlohmann_json
+                      android
+                      log
+                      ${GFXRECON_SOURCE_DIR}/external/precompiled/android/lib/${ANDROID_ABI}/liblz4_static.a
+                      ${GFXRECON_SOURCE_DIR}/external/precompiled/android/lib/${ANDROID_ABI}/libzstd.a
+                      z)
+>>>>>>> android/framework/util/CMakeLists.txt
diff --git a/android/gradle.properties b/android/gradle.properties
index 82618ce..d9b9f88 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -13,3 +13,8 @@ org.gradle.jvmargs=-Xmx1536m
 # org.gradle.parallel=true
 
 
+<<<<<<< android/gradle.properties
+=======
+android.useAndroidX=true
+android.enableJetifier=true
+>>>>>>> android/gradle.properties
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index bc4865b..e46068a 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,8 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+<<<<<<< android/gradle/wrapper/gradle-wrapper.properties
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+=======
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-all.zip
+>>>>>>> android/gradle/wrapper/gradle-wrapper.properties
diff --git a/android/layer/CMakeLists.txt b/android/layer/CMakeLists.txt
index d944cf2..7009b4d 100644
--- a/android/layer/CMakeLists.txt
+++ b/android/layer/CMakeLists.txt
@@ -2,21 +2,60 @@ cmake_minimum_required(VERSION 3.4.1)
 
 get_filename_component(GFXRECON_SOURCE_DIR ../.. ABSOLUTE)
 
+<<<<<<< android/layer/CMakeLists.txt
 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})
+=======
+list(APPEND CMAKE_PREFIX_PATH "${GFXRECON_SOURCE_DIR}/external/nlohmann-json")
+find_package(nlohmann_json REQUIRED)
+
+project(VkLayer_gfxreconstruct)
+
+include(../framework/cmake-config/PlatformConfig.cmake)
+
+# Generate the OpenXR JSON for Android so that it will get picked up and
+# placed in the "assets" folder of the AAR and thus any APK file that
+# later includes it.
+option(GFXRECON_ENABLE_OPENXR "Enable OpenXR support." ON)
+if (GFXRECON_ENABLE_OPENXR)
+    file(TO_NATIVE_PATH "./" RELATIVE_PATH_PREFIX)
+    string(REPLACE "\\" "\\\\" RELATIVE_PATH_PREFIX "${RELATIVE_PATH_PREFIX}")
+    include("FindOpenXRVersion")
+    if ((NOT XR_VERSION_MAJOR STREQUAL "") AND (NOT XR_VERSION_MINOR STREQUAL ""))
+	    message(STATUS "OpenXR support enabled")
+        set(OPENXR_SUPPORT_ENABLED TRUE)
+    else()
+	    message(FATAL_ERROR "Failed to find OpenXR headers for support.  Continuing with it disabled!")
+    endif()
+else()
+    message(STATUS "OpenXR support disabled!")
+endif()
+
+add_subdirectory(../framework/util ${PROJECT_SOURCE_DIR}/../framework/util/build/layer/${ANDROID_ABI})
+add_subdirectory(../framework/graphics ${PROJECT_SOURCE_DIR}/../framework/graphics/build/layer/${ANDROID_ABI})
+add_subdirectory(../framework/format ${PROJECT_SOURCE_DIR}/../framework/format/build/layer/${ANDROID_ABI})
+add_subdirectory(../framework/encode ${PROJECT_SOURCE_DIR}/../framework/encode/build/layer/${ANDROID_ABI})
+>>>>>>> android/layer/CMakeLists.txt
 
 add_library(VkLayer_gfxreconstruct SHARED "")
 
 target_sources(VkLayer_gfxreconstruct
                PRIVATE
                    ${GFXRECON_SOURCE_DIR}/layer/dll_main.cpp
+<<<<<<< android/layer/CMakeLists.txt
                    ${GFXRECON_SOURCE_DIR}/layer/trace_layer.h
                    ${GFXRECON_SOURCE_DIR}/layer/trace_layer.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/encode/custom_layer_func_table.h
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_layer_func_table.h
+=======
+                   ${GFXRECON_SOURCE_DIR}/layer/layer_vulkan_entry.h
+                   ${GFXRECON_SOURCE_DIR}/layer/layer_vulkan_entry.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/encode/custom_vulkan_layer_func_table.h
+                   ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_layer_func_table.h
+>>>>>>> android/layer/CMakeLists.txt
               )
 
 target_include_directories(VkLayer_gfxreconstruct
@@ -33,3 +72,37 @@ target_link_libraries(VkLayer_gfxreconstruct
                       platform_specific
                       android
                       log)
+<<<<<<< android/layer/CMakeLists.txt
+=======
+
+
+if (GFXRECON_ENABLE_OPENXR)
+    include("FindVulkanVersion")
+
+    set(XR_VERSION ${XR_VERSION_MAJOR}.${XR_VERSION_MINOR}.${XR_VERSION_PATCH})
+    math(EXPR GFXRECONSTRUCT_LAYER_JSON_VERSION "${GFXRECONSTRUCT_PROJECT_VERSION_MAJOR} << 22 | ${GFXRECONSTRUCT_PROJECT_VERSION_MINOR} << 12 | ${GFXRECONSTRUCT_PROJECT_VERSION_PATCH}")
+    set(GFXRECONSTRUCT_VERSION_STRING ${GFXRECONSTRUCT_PROJECT_VERSION_MAJOR}.${GFXRECONSTRUCT_PROJECT_VERSION_MINOR}.${GFXRECONSTRUCT_PROJECT_VERSION_PATCH}${GFXRECON_PROJECT_VERSION_DESIGNATION})
+
+    # Firstly, expand variables
+    string(CONFIGURE
+    [=[
+{
+    "file_format_version": "1.0.0",
+    "api_layer": {
+        "name": "XR_APILAYER_LUNARG_gfxreconstruct",
+        "library_path": "libVkLayer_gfxreconstruct.so",
+        "api_version" : "${XR_VERSION}",
+        "implementation_version" : "${GFXRECONSTRUCT_LAYER_JSON_VERSION}",
+        "description": "GFXReconstruct Capture Layer Version ${GFXRECONSTRUCT_VERSION_STRING}",
+        "disable_environment" : "GFXRECON_DISABLE"
+    }
+}
+    ]=]
+    openxr_implicit_layer_contents
+    )
+
+    # Then expand generator expressions
+    file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/assets/openxr/1/api_layers/implicit.d)
+    file(GENERATE OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/assets/openxr/1/api_layers/implicit.d/XrLayer_gfxreconstruct.json CONTENT "${openxr_implicit_layer_contents}")
+endif()
+>>>>>>> android/layer/CMakeLists.txt
diff --git a/android/layer/build.gradle b/android/layer/build.gradle
index fab5d34..f651162 100644
--- a/android/layer/build.gradle
+++ b/android/layer/build.gradle
@@ -2,19 +2,51 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 33
+<<<<<<< android/layer/build.gradle
     ndkVersion '24.0.8215888'
+=======
+    namespace 'com.lunarg.gfxreconstruct.layer'
+    ndkVersion '26.3.11579264'
+>>>>>>> android/layer/build.gradle
     defaultConfig {
         minSdkVersion 26
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         ndk {
+<<<<<<< android/layer/build.gradle
             abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
         }
         externalNativeBuild {
             cmake {
                 cppFlags "-fexceptions", "-std=c++14", "-Wno-nullability-completeness"
                 arguments "-DANDROID_TOOLCHAIN=clang", "-DANDROID_STL=c++_static"
+=======
+            if (project.hasProperty("armeabi-v7a")) {
+                abiFilters 'armeabi-v7a'
+            } else if (project.hasProperty("arm64-v8a")) {
+                abiFilters 'arm64-v8a'
+            } else if (project.hasProperty("x86")) {
+                abiFilters 'x86'
+            } else if (project.hasProperty("x86_64")) {
+                abiFilters 'x86_64'
+            } else {
+                abiFilters 'arm64-v8a', 'x86_64'
+            }
+        }
+        externalNativeBuild {
+            cmake {
+                cppFlags "-fexceptions", "-Wno-nullability-completeness"
+                arguments "-DANDROID_TOOLCHAIN=clang", "-DANDROID_STL=c++_static"
+                if (project.hasProperty("DisableOpenXR")) {
+                    logger.info('GFXReconstruct layer built with NO OpenXr Support! [DisableOpenXR found]')
+                    arguments.add("-DGFXRECON_ENABLE_OPENXR=OFF")
+                }
+                else {
+                    logger.info('GFXReconstruct layer built with OpenXr Support.')
+                    arguments.add("-DGFXRECON_ENABLE_OPENXR=ON")
+                }
+>>>>>>> android/layer/build.gradle
             }
         }
     }
@@ -29,4 +61,13 @@ android {
             path "CMakeLists.txt"
         }
     }
+<<<<<<< android/layer/build.gradle
+=======
+
+    sourceSets {
+       main {
+           assets.srcDirs = ['assets']
+       }
+    }
+>>>>>>> android/layer/build.gradle
 }
diff --git a/android/layer/src/main/AndroidManifest.xml b/android/layer/src/main/AndroidManifest.xml
index 3391fe1..d30d8dc 100644
--- a/android/layer/src/main/AndroidManifest.xml
+++ b/android/layer/src/main/AndroidManifest.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< android/layer/src/main/AndroidManifest.xml
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.lunarg.gfxreconstruct.layer">
+=======
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+>>>>>>> android/layer/src/main/AndroidManifest.xml
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
diff --git a/android/scripts/gfxrecon.py b/android/scripts/gfxrecon.py
index afd3e47..94a6e26 100644
--- a/android/scripts/gfxrecon.py
+++ b/android/scripts/gfxrecon.py
@@ -1,6 +1,10 @@
 #!/usr/bin/env python3
 #
+<<<<<<< android/scripts/gfxrecon.py
 # Copyright (c) 2018-2023 LunarG, Inc.
+=======
+# Copyright (c) 2018-2025 LunarG, Inc.
+>>>>>>> android/scripts/gfxrecon.py
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -32,25 +36,65 @@ argc = len(sys.argv)
 # Supported commands
 valid_commands = [
     'install-apk',
+<<<<<<< android/scripts/gfxrecon.py
+=======
+    'multiwin-replay',
+>>>>>>> android/scripts/gfxrecon.py
     'replay'
 ]
 
 # Arguments
 # gfxrecon install-apk <file>
 # gfxrecon replay [-p | --push-file <file-on-desktop>] <file-on-device>
+<<<<<<< android/scripts/gfxrecon.py
+=======
+# gfxrecon multiwin-replay [-p | --push-file <file-on-desktop>] <file-on-device>
+>>>>>>> android/scripts/gfxrecon.py
 
 # Application info
 app_name = 'com.lunarg.gfxreconstruct.replay'
 app_activity = '"com.lunarg.gfxreconstruct.replay/android.app.NativeActivity"'
+<<<<<<< android/scripts/gfxrecon.py
+=======
+multiwin_app_activity = '"com.lunarg.gfxreconstruct.replay/.ReplayActivity"'
+>>>>>>> android/scripts/gfxrecon.py
 app_action = 'android.intent.action.MAIN'
 app_category = 'android.intent.category.LAUNCHER'
 
 # ADB commands
 adb_install = 'adb install -g -t -r'
 adb_sdk_version = 'adb shell getprop ro.build.version.sdk'
+<<<<<<< android/scripts/gfxrecon.py
 adb_start = 'adb shell am start -n {} -a {} -c {}'.format(app_activity, app_action, app_category)
 adb_stop = 'adb shell am force-stop {}'.format(app_name)
 adb_push = 'adb push'
+=======
+adb_stop = 'adb shell am force-stop {}'.format(app_name)
+adb_push = 'adb push'
+adb_devices = 'adb devices'
+
+# Environment variable for android serial number
+android_serial = 'ANDROID_SERIAL'
+
+class DeviceSelectionException(Exception):
+    pass
+
+def QueryAvailableDevices():
+    result = subprocess.run(shlex.split(adb_devices, posix='win' not in sys.platform), capture_output=True, check=True)
+    devices = result.stdout.decode().strip().splitlines()[1:]
+    return [device.split('\t')[0] for device in devices]
+
+def CheckDeviceSelection():
+    devices = QueryAvailableDevices()
+    if len(devices) <= 1:
+        return
+
+    selection = os.getenv(android_serial)
+    if selection is None or selection == '':
+        raise DeviceSelectionException('Multiple devices detected - you must specify which one to use by setting ANDROID_SERIAL environment variable.')
+    if selection not in devices:
+        raise DeviceSelectionException(f'Selected ({selection}) device not present. Available devices: {devices}')
+>>>>>>> android/scripts/gfxrecon.py
 
 def CreateCommandParser():
     parser = argparse.ArgumentParser(description='GFXReconstruct utility launcher for Android.')
@@ -61,6 +105,10 @@ def CreateCommandParser():
 def CreateInstallApkParser():
     parser = argparse.ArgumentParser(prog=os.path.basename(sys.argv[0]) + ' install-apk', description='Install the replay tool.')
     parser.add_argument('file', help='APK file to install')
+<<<<<<< android/scripts/gfxrecon.py
+=======
+    parser.add_argument('-s', '--select', metavar='DEVICE_ID', help='Specify the destination device id. Needed if multiple devices are attached.')
+>>>>>>> android/scripts/gfxrecon.py
     return parser
 
 def CreateReplayParser():
@@ -68,16 +116,32 @@ def CreateReplayParser():
     parser.add_argument('-p', '--push-file', metavar='LOCAL_FILE', help='Local file to push to the location on device specified by <file>')
     parser.add_argument('--version', action='store_true', default=False, help='Print version information and exit (forwarded to replay tool)')
     parser.add_argument('--log-level', metavar='LEVEL', help='Specify highest level message to log. Options are: debug, info, warning, error, and fatal. Default is info. (forwarded to replay tool)')
+<<<<<<< android/scripts/gfxrecon.py
+    parser.add_argument('--log-file', metavar='DEVICE_FILE', help='Write log messages to a file at the specified path instead of logcat (forwarded to replay tool)')
+    parser.add_argument('--pause-frame', metavar='N', help='Pause after replaying frame number N (forwarded to replay tool)')
+    parser.add_argument('--paused', action='store_true', default=False, help='Pause after replaying the first frame (same as "--pause-frame 1"; forwarded to replay tool)')
+    parser.add_argument('--screenshot-all', action='store_true', default=False, help='Generate screenshots for all frames.  When this option is specified, --screenshots is ignored (forwarded to replay tool)')
+    parser.add_argument('--screenshots', metavar='RANGES', help='Generate screenshots for the specified frames.  Target frames are specified as a comma separated list of frame ranges.  A frame range can be specified as a single value, to specify a single frame, or as two hyphenated values, to specify the first and last frames to process.  Frame ranges should be specified in ascending order and cannot overlap.  Note that frame numbering is 1-based (i.e. the first frame is frame 1).  Example: 200,301-305 will generate six screenshots (forwarded to replay tool)')
+=======
+    parser.add_argument('--log-timestamps', action='store_true', help='Output a timestamp in front of each log message. (forwarded to replay tool)')
     parser.add_argument('--log-file', metavar='DEVICE_FILE', help='Write log messages to a file at the specified path instead of logcat (forwarded to replay tool)')
+    parser.add_argument('--debug-messenger-level', metavar='LEVEL', help='Specify highest debug messenger severity level. Options are: debug, info, warning, and error. Default is warning. (forwarded to replay tool)')
     parser.add_argument('--pause-frame', metavar='N', help='Pause after replaying frame number N (forwarded to replay tool)')
     parser.add_argument('--paused', action='store_true', default=False, help='Pause after replaying the first frame (same as "--pause-frame 1"; forwarded to replay tool)')
+    parser.add_argument('--cpu-mask', metavar='binary_mask', help='Set of CPU cores used by the replayer. `binary-mask` is a succession of "0" and "1" that specifies used/unused cores read from left to right. For example "10010" activates the first and fourth cores and deactivate all other cores. If the option is not set, all cores can be used. If the option is set only for some cores, the other cores are not used. (forwarded to replay tool)')
     parser.add_argument('--screenshot-all', action='store_true', default=False, help='Generate screenshots for all frames.  When this option is specified, --screenshots is ignored (forwarded to replay tool)')
     parser.add_argument('--screenshots', metavar='RANGES', help='Generate screenshots for the specified frames.  Target frames are specified as a comma separated list of frame ranges.  A frame range can be specified as a single value, to specify a single frame, or as two hyphenated values, to specify the first and last frames to process.  Frame ranges should be specified in ascending order and cannot overlap.  Note that frame numbering is 1-based (i.e. the first frame is frame 1).  Example: 200,301-305 will generate six screenshots (forwarded to replay tool)')
+    parser.add_argument('--screenshot-interval', metavar='INTERVAL', help='Specifies the number of frames between two screenshots within a screenshot range. Example: If screenshot range is 10-15 and interval is 2, screenshot will be generated for frames 10, 12 and 14. Default is 1. (forwarded to replay tool)')
+>>>>>>> android/scripts/gfxrecon.py
     parser.add_argument('--screenshot-format', metavar='FORMAT', choices=['bmp', 'png'], help='Image file format to use for screenshot generation.  Available formats are: bmp, png (forwarded to replay tool)')
     parser.add_argument('--screenshot-dir', metavar='DIR', help='Directory to write screenshots. Default is "/sdcard" (forwarded to replay tool)')
     parser.add_argument('--screenshot-prefix', metavar='PREFIX', help='Prefix to apply to the screenshot file name.  Default is "screenshot" (forwarded to replay tool)')
     parser.add_argument('--screenshot-size', metavar='SIZE', help='Screenshot dimensions. Ignored if --screenshot-scale is specified.  Expected format is <width>x<height>.')
     parser.add_argument('--screenshot-scale', metavar='SCALE', help='Scale screenshot dimensions. Overrides --screenshot-size, if specified. Expects a number which can be decimal')
+<<<<<<< android/scripts/gfxrecon.py
+=======
+    parser.add_argument('--capture', action='store_true', default=False, help='Capture the replaying GFXR file. Capture option behavior and usage is the same as when capturing with the GFXR layer. The capture functionality is included in the `gfxrecon-replay` executable--no GFXR capture layer is added to the Vulkan layer chain.')
+>>>>>>> android/scripts/gfxrecon.py
     parser.add_argument('--sfa', '--skip-failed-allocations', action='store_true', default=False, help='Skip vkAllocateMemory, vkAllocateCommandBuffers, and vkAllocateDescriptorSets calls that failed during capture (forwarded to replay tool)')
     parser.add_argument('--opcd', '--omit-pipeline-cache-data', action='store_true', default=False, help='Omit pipeline cache data from calls to vkCreatePipelineCache and skip calls to vkGetPipelineCacheData (forwarded to replay tool)')
     parser.add_argument('--surface-index', metavar='N', help='Restrict rendering to the Nth surface object created.  Used with captures that include multiple surfaces.  Default is -1 (render to all surfaces; forwarded to replay tool)')
@@ -92,14 +156,36 @@ def CreateReplayParser():
     parser.add_argument('--quit-after-measurement-range', action='store_true', default=False, help='If this is specified the replayer will abort when it reaches the <end_frame> specified in the --measurement-frame-range argument. (forwarded to replay tool)')
     parser.add_argument('--flush-measurement-range', action='store_true', default=False, help='If this is specified the replayer will flush and wait for all current GPU work to finish at the start and end of the measurement range. (forwarded to replay tool)')
     parser.add_argument('--flush-inside-measurement-range', action='store_true', default=False, help='If this is specified the replayer will flush and wait for all current GPU work to finish at end of each frame inside the measurement range. (forwarded to replay tool)')
+<<<<<<< android/scripts/gfxrecon.py
     parser.add_argument('--sgfs', '--skip-get-fence-status', metavar='STATUS', default=0, help='Specify behaviour to skip calls to vkWaitForFences and vkGetFenceStatus. Default is 0 - No skip (forwarded to replay tool)')
+=======
+    parser.add_argument('--sgfs', '--skip-get-fence-status', metavar='STATUS', default=0, help='Specify behavior to skip calls to vkWaitForFences and vkGetFenceStatus. Default is 0 - No skip (forwarded to replay tool)')
+>>>>>>> android/scripts/gfxrecon.py
     parser.add_argument('--sgfr', '--skip-get-fence-ranges', metavar='FRAME-RANGES', default='', help='Frame ranges where --sgfs applies. Default is all frames (forwarded to replay tool)')
     parser.add_argument('--wait-before-present', action='store_true', default=False, help='Force wait on completion of queue operations for all queues before calling Present. This is needed for accurate acquisition of instrumentation data on some platforms.')
     parser.add_argument('-m', '--memory-translation', metavar='MODE', choices=['none', 'remap', 'realign', 'rebind'], help='Enable memory translation for replay on GPUs with memory types that are not compatible with the capture GPU\'s memory types.  Available modes are: none, remap, realign, rebind (forwarded to replay tool)')
     parser.add_argument('--swapchain', metavar='MODE', choices=['virtual', 'captured', 'offscreen'], help='Choose a swapchain mode to replay. Available modes are: virtual, captured, offscreen (forwarded to replay tool)')
+<<<<<<< android/scripts/gfxrecon.py
+    parser.add_argument('--vssb', '--virtual-swapchain-skip-blit', action='store_true', default=False, help='Skip blit to real swapchain to gain performance during replay.')
+    parser.add_argument('--use-captured-swapchain-indices', action='store_true', default=False, help='Same as "--swapchain captured". Ignored if the "--swapchain" option is used.')
+    parser.add_argument('file', nargs='?', help='File on device to play (forwarded to replay tool)')
+=======
+    parser.add_argument('--present-mode', metavar='MODE', choices=['capture', 'immediate', 'mailbox', 'fifo', 'fifo_relaxed'], help='Set swapchain\'s VkPresentModeKHR. Available modes are: auto, immediate, mailbox, fifo, fifo_relaxed (forwarded to replay tool)')
     parser.add_argument('--vssb', '--virtual-swapchain-skip-blit', action='store_true', default=False, help='Skip blit to real swapchain to gain performance during replay.')
     parser.add_argument('--use-captured-swapchain-indices', action='store_true', default=False, help='Same as "--swapchain captured". Ignored if the "--swapchain" option is used.')
     parser.add_argument('file', nargs='?', help='File on device to play (forwarded to replay tool)')
+    parser.add_argument('--dump-resources', metavar='DUMP_RESOURCES', help='Extract dump resources block indices and options from the specified json file. The format for the json file is documented in detail in vulkan_dump_resources.md.')
+    parser.add_argument('--dump-resources-dir', metavar='DIR', help='Directory to write dump resources output files.')
+    parser.add_argument('--pbi-all', action='store_true', default=False, help='Print all block information.')
+    parser.add_argument('--pbis', metavar='RANGES', default=False, help='Print block information between block index1 and block index2')
+    parser.add_argument('--pcj', '--pipeline-creation-jobs', action='store_true', default=False, help='Specify the number of pipeline-creation-jobs or background-threads.')
+    parser.add_argument('--save-pipeline-cache', metavar='DEVICE_FILE', help='If set, produces pipeline caches at replay time instead of using the one saved at capture time and save those caches in DEVICE_FILE. (forwarded to replay tool)')
+    parser.add_argument('--load-pipeline-cache', metavar='DEVICE_FILE', help='If set, loads data created by the `--save-pipeline-cache` option in DEVICE_FILE and uses it to create the pipelines instead of the pipeline caches saved at capture time. (forwarded to replay tool)')
+    parser.add_argument('--add-new-pipeline-caches', action='store_true', default=False, help='If set, allows gfxreconstruct to create new vkPipelineCache objects when it encounters a pipeline created without cache. This option can be used in coordination with `--save-pipeline-cache` and `--load-pipeline-cache`. (forwarded to replay tool)')
+    parser.add_argument('--quit-after-frame', metavar='FRAME', help='Specify a frame after which replay will terminate.')
+    parser.add_argument('--screenshot-ignore-FrameBoundaryANDROID', action='store_true', default=False, help='If set, frames switced with vkFrameBoundANDROID will be ignored from the screenshot handler.')
+
+>>>>>>> android/scripts/gfxrecon.py
     return parser
 
 def MakeExtrasString(args):
@@ -112,10 +198,23 @@ def MakeExtrasString(args):
         arg_list.append('--log-level')
         arg_list.append('{}'.format(args.log_level))
 
+<<<<<<< android/scripts/gfxrecon.py
+=======
+    if args.log_timestamps:
+        arg_list.append('--log-timestamps')
+
+>>>>>>> android/scripts/gfxrecon.py
     if args.log_file:
         arg_list.append('--log-file')
         arg_list.append('{}'.format(args.log_file))
 
+<<<<<<< android/scripts/gfxrecon.py
+=======
+    if args.debug_messenger_level:
+        arg_list.append('--debug-messenger-level')
+        arg_list.append('{}'.format(args.debug_messenger_level))
+
+>>>>>>> android/scripts/gfxrecon.py
     if args.pause_frame:
         arg_list.append('--pause-frame')
         arg_list.append('{}'.format(args.pause_frame))
@@ -123,12 +222,26 @@ def MakeExtrasString(args):
     if args.paused:
         arg_list.append('--paused')
 
+<<<<<<< android/scripts/gfxrecon.py
+=======
+    if args.cpu_mask:
+        arg_list.append('--cpu-mask')
+        arg_list.append('{}'.format(args.cpu_mask))
+
+>>>>>>> android/scripts/gfxrecon.py
     if args.screenshot_all:
         arg_list.append('--screenshot-all')
     elif args.screenshots:
         arg_list.append('--screenshots')
         arg_list.append('{}'.format(args.screenshots))
 
+<<<<<<< android/scripts/gfxrecon.py
+=======
+    if args.screenshot_interval:
+        arg_list.append('--screenshot-interval')
+        arg_list.append('{}'.format(args.screenshot_interval))
+
+>>>>>>> android/scripts/gfxrecon.py
     if args.screenshot_format:
         arg_list.append('--screenshot-format')
         arg_list.append('{}'.format(args.screenshot_format))
@@ -149,6 +262,12 @@ def MakeExtrasString(args):
         arg_list.append('--screenshot-scale')
         arg_list.append('{}'.format(args.screenshot_scale))
 
+<<<<<<< android/scripts/gfxrecon.py
+=======
+    if args.capture:
+        arg_list.append('--capture')
+
+>>>>>>> android/scripts/gfxrecon.py
     if args.sfa:
         arg_list.append('--sfa')
 
@@ -198,6 +317,13 @@ def MakeExtrasString(args):
         arg_list.append('--swapchain')
         arg_list.append('{}'.format(args.swapchain))
 
+<<<<<<< android/scripts/gfxrecon.py
+=======
+    if args.present_mode:
+        arg_list.append('--present-mode')
+        arg_list.append('{}'.format(args.present_mode))
+
+>>>>>>> android/scripts/gfxrecon.py
     if args.offscreen_swapchain_frame_boundary:
         arg_list.append('--offscreen-swapchain-frame-boundary')
 
@@ -219,6 +345,46 @@ def MakeExtrasString(args):
     if args.wait_before_present:
         arg_list.append('--wait-before-present')
 
+<<<<<<< android/scripts/gfxrecon.py
+=======
+    if args.dump_resources:
+        arg_list.append('--dump-resources')
+        arg_list.append('{}'.format(args.dump_resources))
+
+    if args.dump_resources_dir:
+        arg_list.append('--dump-resources-dir')
+        arg_list.append('{}'.format(args.dump_resources_dir))
+
+    if args.pbi_all:
+        arg_list.append('--pbi-all')
+
+    if args.pbis:
+        arg_list.append('--pbis')
+        arg_list.append('{}'.format(args.pbis))
+
+    if args.pcj:
+        arg_list.append('--pcj')
+        arg_list.append('{}'.format(args.pcj))
+
+    if args.save_pipeline_cache:
+        arg_list.append('--save-pipeline-cache')
+        arg_list.append('{}'.format(args.save_pipeline_cache))
+
+    if args.load_pipeline_cache:
+        arg_list.append('--load-pipeline-cache')
+        arg_list.append('{}'.format(args.load_pipeline_cache))
+
+    if args.add_new_pipeline_caches:
+        arg_list.append('--add-new-pipeline-caches')
+
+    if args.quit_after_frame:
+        arg_list.append('--quit-after-frame')
+        arg_list.append('{}'.format(args.quit_after_frame))
+
+    if args.screenshot_ignore_FrameBoundaryANDROID:
+        arg_list.append('--screenshot-ignore-FrameBoundaryANDROID')
+
+>>>>>>> android/scripts/gfxrecon.py
     if args.file:
         arg_list.append(args.file)
     elif not args.version:
@@ -233,15 +399,30 @@ def InstallApk(install_args):
     sdk = int(subprocess.check_output(shlex.split(adb_sdk_version)).decode())
     force_queryable = ' --force-queryable' if sdk >= 30 else ''
     cmd = adb_install + force_queryable + ' ' + args.file
+<<<<<<< android/scripts/gfxrecon.py
     print('Executing:', cmd)
     subprocess.check_call(shlex.split(cmd, posix='win' not in sys.platform))
 
 def Replay(replay_args):
+=======
+
+    CheckDeviceSelection()
+
+    print('Executing:', cmd)
+    subprocess.check_call(shlex.split(cmd, posix='win' not in sys.platform))
+
+def ReplayCommon(replay_args, activity):
+>>>>>>> android/scripts/gfxrecon.py
     replay_parser = CreateReplayParser()
     args = replay_parser.parse_args(replay_args)
 
     extras = MakeExtrasString(args)
 
+<<<<<<< android/scripts/gfxrecon.py
+=======
+    CheckDeviceSelection()
+
+>>>>>>> android/scripts/gfxrecon.py
     if extras:
         if args.push_file:
             cmd = ' '.join([adb_push, args.push_file, args.file])
@@ -251,13 +432,32 @@ def Replay(replay_args):
         print('Executing:', adb_stop)
         subprocess.check_call(shlex.split(adb_stop, posix='win' not in sys.platform))
 
+<<<<<<< android/scripts/gfxrecon.py
         cmd = ' '.join([adb_start, '--es', '"args"', '"{}"'.format(extras)])
         print('Executing:', cmd)
+=======
+        adb_start = 'adb shell am start -n {} -a {} -c {}'.format(activity, app_action, app_category)
+
+        print(f'Executing: {adb_start} --es args \'"{extras}"\'')
+        cmd = ' '.join([adb_start, '--es', 'args', '"{}"'.format(extras)])
+>>>>>>> android/scripts/gfxrecon.py
 
         # Specify posix=False to prevent removal of quotes from adb extras.
         subprocess.check_call(shlex.split(cmd, posix=False))
 
+<<<<<<< android/scripts/gfxrecon.py
 if __name__ == '__main__':
+=======
+def Replay(replay_args):
+    ReplayCommon(replay_args, app_activity)
+
+def MultiWinReplay(replay_args):
+    ReplayCommon(replay_args, multiwin_app_activity)
+
+if __name__ == '__main__':
+    devices = QueryAvailableDevices()
+
+>>>>>>> android/scripts/gfxrecon.py
     command_parser = CreateCommandParser()
     command = command_parser.parse_args()
 
@@ -265,3 +465,8 @@ if __name__ == '__main__':
         InstallApk(command.args)
     elif command.command == 'replay':
         Replay(command.args)
+<<<<<<< android/scripts/gfxrecon.py
+=======
+    elif command.command == 'multiwin-replay':
+        MultiWinReplay(command.args)
+>>>>>>> android/scripts/gfxrecon.py
diff --git a/android/settings.gradle b/android/settings.gradle
index 68c1270..b47c2a2 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,3 +1,15 @@
 include ':layer'
+<<<<<<< android/settings.gradle
 include ':replay'
 project(':replay').projectDir = file('tools/replay')
+=======
+
+include ':replay'
+project(':replay').projectDir = file('tools/replay')
+include ':multi-win-replay'
+project(':multi-win-replay').projectDir = file('tools/multi-win-replay')
+include ':quest_replay'
+project(':quest_replay').projectDir = file('tools/quest_replay')
+include ':test_launcher'
+project(':test_launcher').projectDir = file('test/test_apps/launcher')
+>>>>>>> android/settings.gradle
diff --git a/android/test/test_apps/common/CMakeLists.txt b/android/test/test_apps/common/CMakeLists.txt
new file mode 100644
index 0000000..15fbe9f
--- /dev/null
+++ b/android/test/test_apps/common/CMakeLists.txt
@@ -0,0 +1,69 @@
+###############################################################################
+# Copyright (c) 2025 LunarG, Inc.
+# All rights reserved
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+#
+# Author: LunarG Team
+# Description: CMake script for Android test app base
+###############################################################################
+
+add_library(gfxrecon-testapp-base STATIC ${GFXRECON_SOURCE_DIR}/test/test_apps/common/test_app_base.cpp)
+target_include_directories(gfxrecon-testapp-base
+                           PRIVATE
+                               ${GFXRECON_SOURCE_DIR}/external)
+target_include_directories(gfxrecon-testapp-base
+                           PUBLIC
+                               ${GFXRECON_SOURCE_DIR}/test/test_apps/common
+                               ${GFXRECON_SOURCE_DIR}/test/icd)
+
+set(FRAMEWORK_DIR ${GFXRECON_ANDROID_DIR}/framework)
+set(GFXRECON_ANDROID_TEST_APPS_DIR ${CMAKE_SOURCE_DIR}/..)
+add_subdirectory(${FRAMEWORK_DIR}/util ${FRAMEWORK_DIR}/util/build/${ANDROID_ABI})
+add_subdirectory(${FRAMEWORK_DIR}/decode ${FRAMEWORK_DIR}/decode/build/${ANDROID_ABI})
+add_subdirectory(${FRAMEWORK_DIR}/graphics ${FRAMEWORK_DIR}/graphics/build/${ANDROID_ABI})
+add_subdirectory(${FRAMEWORK_DIR}/format ${FRAMEWORK_DIR}/format/build/${ANDROID_ABI})
+add_subdirectory(${FRAMEWORK_DIR}/application ${FRAMEWORK_DIR}/application/build/${ANDROID_ABI})
+
+target_link_libraries(gfxrecon-testapp-base
+    PUBLIC
+    gfxrecon_util
+    gfxrecon_application)
+
+
+macro(common_build_directives TARGET)
+endmacro()
+
+macro(add_test_app TEST_NAME)
+    add_subdirectory(${GFXRECON_SOURCE_DIR}/test/test_apps/${TEST_NAME}
+                     ${GFXRECON_ANDROID_TEST_APPS_DIR}/${TEST_NAME}/build/${ANDROID_ABI})
+endmacro()
+
+add_test_app(acquired-image)
+add_test_app(external-memory-fd-export)
+add_test_app(external-memory-fd-import)
+add_test_app(host-image-copy)
+add_test_app(multisample-depth)
+add_test_app(pipeline-binaries)
+add_test_app(triangle)
+add_test_app(triangle-extra-device)
+add_test_app(shader-objects)
+add_test_app(sparse-resources)
+add_test_app(wait-for-present)
+add_test_app(ahb)
diff --git a/android/test/test_apps/launcher/.gitignore b/android/test/test_apps/launcher/.gitignore
new file mode 100644
index 0000000..5348b08
--- /dev/null
+++ b/android/test/test_apps/launcher/.gitignore
@@ -0,0 +1,2 @@
+/build
+src/main/assets
diff --git a/android/test/test_apps/launcher/CMakeLists.txt b/android/test/test_apps/launcher/CMakeLists.txt
new file mode 100644
index 0000000..f57a684
--- /dev/null
+++ b/android/test/test_apps/launcher/CMakeLists.txt
@@ -0,0 +1,70 @@
+##############################################################################
+# Copyright (c) 2025 LunarG, Inc.
+# All rights reserved
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+#
+# Author: LunarG Team
+# Description: CMake script for Test launcher app
+###############################################################################
+
+cmake_minimum_required(VERSION 3.4.1)
+
+get_filename_component(GFXRECON_SOURCE_DIR ../../../.. ABSOLUTE)
+set(GFXRECON_ANDROID_DIR ${GFXRECON_SOURCE_DIR}/android)
+include(${GFXRECON_ANDROID_DIR}/framework/cmake-config/PlatformConfig.cmake)
+
+project(gfxrecon-test-launcher)
+
+set(GFXRECON_ANDROID_TEST_APPS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)
+
+set(COMMON_DIR ${GFXRECON_ANDROID_TEST_APPS_DIR}/common)
+add_subdirectory(${COMMON_DIR} ${COMMON_DIR}/build/${ANDROID_ABI})
+
+
+add_library(${PROJECT_NAME}
+            SHARED
+                ${GFXRECON_SOURCE_DIR}/test/test_apps/launcher/test_launcher.cpp)
+
+target_include_directories(${PROJECT_NAME}
+                           PUBLIC
+                               ${GFXRECON_SOURCE_DIR}
+                               ${GFXRECON_SOURCE_DIR}/external/precompiled/android/include
+                               ${CMAKE_BINARY_DIR})
+
+set(GFXRECON_TEST_LAUNCHER_LINK_LIBRARIES
+    gfxrecon-testapp-acquired-image
+    gfxrecon-testapp-host-image-copy
+    gfxrecon-testapp-multisample-depth
+    gfxrecon-testapp-pipeline-binaries
+    gfxrecon-testapp-shader-objects
+    gfxrecon-testapp-sparse-resources
+    gfxrecon-testapp-triangle
+    gfxrecon-testapp-triangle-extra-device
+    gfxrecon-testapp-external-memory-fd-export
+    gfxrecon-testapp-external-memory-fd-import
+    gfxrecon-testapp-wait-for-present
+    gfxrecon-testapp-ahb)
+
+target_link_libraries(${PROJECT_NAME}
+                      ${GFXRECON_TEST_LAUNCHER_LINK_LIBRARIES})
+
+target_link_options(${PROJECT_NAME}
+    PRIVATE
+        LINKER:--version-script=${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.map)
diff --git a/android/test/test_apps/launcher/build.gradle b/android/test/test_apps/launcher/build.gradle
new file mode 100644
index 0000000..d2c8c3c
--- /dev/null
+++ b/android/test/test_apps/launcher/build.gradle
@@ -0,0 +1,55 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 33
+    namespace 'com.lunarg.gfxreconstruct.test.test_apps.test_launcher'
+    ndkVersion '26.3.11579264'
+    defaultConfig {
+        applicationId "com.lunarg.gfxreconstruct.test.test_apps.test_launcher"
+        minSdkVersion 26
+        targetSdkVersion 33
+        versionCode 1
+        versionName "1.0"
+        ndk {
+            if (project.hasProperty("armeabi-v7a")) {
+                abiFilters 'armeabi-v7a'
+            } else if (project.hasProperty("arm64-v8a")) {
+                abiFilters 'arm64-v8a'
+            } else if (project.hasProperty("x86")) {
+                abiFilters 'x86'
+            } else if (project.hasProperty("x86_64")) {
+                abiFilters 'x86_64'
+            } else {
+                abiFilters 'arm64-v8a', 'x86_64'
+            }
+        }
+        externalNativeBuild {
+            cmake {
+                cppFlags "-fexceptions", "-Wno-nullability-completeness"
+                arguments "-DANDROID_TOOLCHAIN=clang", "-DANDROID_STL=c++_static"
+            }
+        }
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    externalNativeBuild {
+        cmake {
+            path "CMakeLists.txt"
+        }
+    }
+    sourceSets {
+        main {
+            assets.srcDirs = ['../../../../test/test_apps/res']
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.0'
+}
diff --git a/android/test/test_apps/launcher/gfxrecon-test-launcher.map b/android/test/test_apps/launcher/gfxrecon-test-launcher.map
new file mode 100644
index 0000000..a077296
--- /dev/null
+++ b/android/test/test_apps/launcher/gfxrecon-test-launcher.map
@@ -0,0 +1,6 @@
+{
+  global:
+    ANativeActivity_onCreate;
+  local:
+    *;
+};
diff --git a/android/test/test_apps/launcher/proguard-rules.pro b/android/test/test_apps/launcher/proguard-rules.pro
new file mode 100644
index 0000000..f1b4245
--- /dev/null
+++ b/android/test/test_apps/launcher/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/android/test/test_apps/launcher/src/main/AndroidManifest.xml b/android/test/test_apps/launcher/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..269ba2d
--- /dev/null
+++ b/android/test/test_apps/launcher/src/main/AndroidManifest.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
+
+    <!-- This .apk has no Java code itself, so set hasCode to false. -->
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:theme="@style/AppTheme"
+        android:supportsRtl="true"
+        android:extractNativeLibs="true"
+        android:hasCode="false">
+        <activity android:name="android.app.NativeActivity"
+                  android:exported="true"
+                  android:configChanges="orientation|screenSize|keyboard|keyboardHidden|screenLayout"
+                  android:screenOrientation="unspecified">
+            <meta-data android:name="android.app.lib_name"
+                       android:value="gfxrecon-test-launcher" />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/android/test/test_apps/launcher/src/main/res/drawable-v24/ic_launcher_foreground.xml b/android/test/test_apps/launcher/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 0000000..1f6bb29
--- /dev/null
+++ b/android/test/test_apps/launcher/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
diff --git a/android/test/test_apps/launcher/src/main/res/drawable/ic_launcher_background.xml b/android/test/test_apps/launcher/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 0000000..0d025f9
--- /dev/null
+++ b/android/test/test_apps/launcher/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#008577"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
diff --git a/android/test/test_apps/launcher/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/test/test_apps/launcher/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..eca70cf
--- /dev/null
+++ b/android/test/test_apps/launcher/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/android/test/test_apps/launcher/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/test/test_apps/launcher/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000..eca70cf
--- /dev/null
+++ b/android/test/test_apps/launcher/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/android/test/test_apps/launcher/src/main/res/mipmap-hdpi/ic_launcher.png b/android/test/test_apps/launcher/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..898f3ed
Binary files /dev/null and b/android/test/test_apps/launcher/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/test/test_apps/launcher/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/test/test_apps/launcher/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..dffca36
Binary files /dev/null and b/android/test/test_apps/launcher/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/android/test/test_apps/launcher/src/main/res/mipmap-mdpi/ic_launcher.png b/android/test/test_apps/launcher/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..64ba76f
Binary files /dev/null and b/android/test/test_apps/launcher/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/test/test_apps/launcher/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/test/test_apps/launcher/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..dae5e08
Binary files /dev/null and b/android/test/test_apps/launcher/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/android/test/test_apps/launcher/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/test/test_apps/launcher/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..e5ed465
Binary files /dev/null and b/android/test/test_apps/launcher/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/test/test_apps/launcher/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/test/test_apps/launcher/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..14ed0af
Binary files /dev/null and b/android/test/test_apps/launcher/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/android/test/test_apps/launcher/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/test/test_apps/launcher/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..b0907ca
Binary files /dev/null and b/android/test/test_apps/launcher/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/test/test_apps/launcher/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/test/test_apps/launcher/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..d8ae031
Binary files /dev/null and b/android/test/test_apps/launcher/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/android/test/test_apps/launcher/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/test/test_apps/launcher/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..2c18de9
Binary files /dev/null and b/android/test/test_apps/launcher/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/test/test_apps/launcher/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/test/test_apps/launcher/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..beed3cd
Binary files /dev/null and b/android/test/test_apps/launcher/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/android/test/test_apps/launcher/src/main/res/values/colors.xml b/android/test/test_apps/launcher/src/main/res/values/colors.xml
new file mode 100644
index 0000000..69b2233
--- /dev/null
+++ b/android/test/test_apps/launcher/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#008577</color>
+    <color name="colorPrimaryDark">#00574B</color>
+    <color name="colorAccent">#D81B60</color>
+</resources>
diff --git a/android/test/test_apps/launcher/src/main/res/values/strings.xml b/android/test/test_apps/launcher/src/main/res/values/strings.xml
new file mode 100644
index 0000000..523a261
--- /dev/null
+++ b/android/test/test_apps/launcher/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">gfxrecon-testapp-triangle</string>
+</resources>
diff --git a/android/test/test_apps/launcher/src/main/res/values/styles.xml b/android/test/test_apps/launcher/src/main/res/values/styles.xml
new file mode 100644
index 0000000..4caddd6
--- /dev/null
+++ b/android/test/test_apps/launcher/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="@android:style/Theme.NoTitleBar.Fullscreen">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
diff --git a/android/test/test_apps/triangle/.gitignore b/android/test/test_apps/triangle/.gitignore
new file mode 100644
index 0000000..5348b08
--- /dev/null
+++ b/android/test/test_apps/triangle/.gitignore
@@ -0,0 +1,2 @@
+/build
+src/main/assets
diff --git a/android/test/test_apps/triangle/CMakeLists.txt b/android/test/test_apps/triangle/CMakeLists.txt
new file mode 100644
index 0000000..5f4902c
--- /dev/null
+++ b/android/test/test_apps/triangle/CMakeLists.txt
@@ -0,0 +1,38 @@
+##############################################################################
+# Copyright (c) 2025 LunarG, Inc.
+# All rights reserved
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+#
+# Author: LunarG Team
+# Description: CMake script for Android triangle test app
+###############################################################################
+
+get_filename_component(GFXRECON_SOURCE_DIR ../../../.. ABSOLUTE)
+
+set(TRIANGLE_DIR ${GFXRECON_SOURCE_DIR}/test/test_apps/triangle)
+add_library(gfxrecon-testapp-triangle
+            STATIC
+                ${TRIANGLE_DIR}/app.cpp)
+
+target_include_directories(gfxrecon-testapp-triangle
+                           PUBLIC
+                               ${TRIANGLE_DIR}
+                               ${GFXRECON_SOURCE_DIR}/external/precompiled/android/include
+                               ${CMAKE_BINARY_DIR})
\ No newline at end of file
diff --git a/android/tools/multi-win-replay/.gitignore b/android/tools/multi-win-replay/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/android/tools/multi-win-replay/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/android/tools/multi-win-replay/AndroidManifest.xml b/android/tools/multi-win-replay/AndroidManifest.xml
new file mode 100644
index 0000000..bf64d75
--- /dev/null
+++ b/android/tools/multi-win-replay/AndroidManifest.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
+
+    <!-- This .apk has no Java code itself, so set hasCode to false. -->
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:theme="@style/AppTheme"
+        android:supportsRtl="true"
+        android:extractNativeLibs="true"
+        android:hasCode="true">
+        <activity android:name=".ReplayActivity"
+                  android:exported="true"
+                  android:configChanges="orientation|screenSize|keyboard|keyboardHidden|screenLayout"
+                  android:screenOrientation="unspecified">
+            <meta-data android:name="android.app.lib_name"
+                       android:value="gfxrecon-replay" />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/android/tools/multi-win-replay/CMakeLists.txt b/android/tools/multi-win-replay/CMakeLists.txt
new file mode 100644
index 0000000..142fdcd
--- /dev/null
+++ b/android/tools/multi-win-replay/CMakeLists.txt
@@ -0,0 +1,50 @@
+# For more information about using CMake with Android Studio, read the
+# documentation: https://d.android.com/studio/projects/add-native-code.html
+
+cmake_minimum_required(VERSION 3.4.1)
+
+project(gfxrecon-replay)
+
+get_filename_component(GFXRECON_SOURCE_DIR ../../.. ABSOLUTE)
+
+# because the NDK sets CMAKE_FIND_ROOT_PATH_MODE_*  to ONLY, it ignores
+# us setting CMAKE_PREFIX_PATH.  So just set the package DIR directly.
+set(nlohmann_json_DIR "${GFXRECON_SOURCE_DIR}/external/nlohmann-json/share/cmake/nlohmann_json")
+find_package(nlohmann_json REQUIRED CONFIG PATHS "${nlohmann_json_DIR}" NO_DEFAULT_PATH)
+
+include(../../framework/cmake-config/PlatformConfig.cmake)
+add_subdirectory(../../framework/util ${PROJECT_SOURCE_DIR}/../../framework/util/build/tools/replay/${ANDROID_ABI})
+add_subdirectory(../../framework/graphics ${PROJECT_SOURCE_DIR}/../../framework/graphics/build/tools/replay/${ANDROID_ABI})
+add_subdirectory(../../framework/format ${PROJECT_SOURCE_DIR}/../../framework/format/build/tools/replay/${ANDROID_ABI})
+add_subdirectory(../../framework/decode ${PROJECT_SOURCE_DIR}/../../framework/decode/build/tools/replay/${ANDROID_ABI})
+add_subdirectory(../../framework/encode ${PROJECT_SOURCE_DIR}/../../framework/encode/build/tools/replay/${ANDROID_ABI})
+add_subdirectory(../../framework/application-multi-win ${PROJECT_SOURCE_DIR}/../../framework/application/build/tools/replay/${ANDROID_ABI})
+
+add_library(gfxrecon-replay
+            SHARED
+                ${GFXRECON_SOURCE_DIR}/tools/tool_settings.h
+                ${GFXRECON_SOURCE_DIR}/tools/replay/parse_dump_resources_cli.h
+                ${GFXRECON_SOURCE_DIR}/tools/replay/parse_dump_resources_cli.cpp
+                ${GFXRECON_SOURCE_DIR}/tools/replay/replay_settings.h
+                ${GFXRECON_SOURCE_DIR}/tools/replay/replay_pre_processing.h
+                ${GFXRECON_SOURCE_DIR}/tools/replay/recapture_vulkan_entry.cpp
+                ${GFXRECON_SOURCE_DIR}/tools/replay/recapture_vulkan_entry.h
+                ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_recapture_func_table.h
+                ${GFXRECON_SOURCE_DIR}/tools/replay/android_main.cpp)
+
+target_include_directories(gfxrecon-replay
+                           PUBLIC
+                               ${GFXRECON_SOURCE_DIR}/external/precompiled/android/include
+                               ${GFXRECON_SOURCE_DIR}
+                               ${CMAKE_BINARY_DIR})
+
+target_link_libraries(
+        gfxrecon-replay
+        gfxrecon_application_multiwin
+        gfxrecon_decode
+        gfxrecon_encode
+        gfxrecon_graphics
+        gfxrecon_format
+        platform_specific)
+
+message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
diff --git a/android/tools/multi-win-replay/build.gradle b/android/tools/multi-win-replay/build.gradle
new file mode 100644
index 0000000..32b84a1
--- /dev/null
+++ b/android/tools/multi-win-replay/build.gradle
@@ -0,0 +1,61 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 33
+    namespace 'com.lunarg.gfxreconstruct.replay'
+    ndkVersion '26.3.11579264'
+    defaultConfig {
+        applicationId "com.lunarg.gfxreconstruct.replay"
+        minSdkVersion 26
+        targetSdkVersion 33
+        versionCode 1
+        versionName "1.0"
+        ndk {
+            if (project.hasProperty("armeabi-v7a")) {
+                abiFilters 'armeabi-v7a'
+            } else if (project.hasProperty("arm64-v8a")) {
+                abiFilters 'arm64-v8a'
+            } else if (project.hasProperty("x86")) {
+                abiFilters 'x86'
+            } else if (project.hasProperty("x86_64")) {
+                abiFilters 'x86_64'
+            } else {
+                abiFilters 'arm64-v8a', 'x86_64'
+            }
+        }
+        externalNativeBuild {
+            cmake {
+                cppFlags "-fexceptions", "-Wno-nullability-completeness"
+                arguments "-DANDROID_TOOLCHAIN=clang", "-DANDROID_STL=c++_static"
+            }
+        }
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            res.srcDirs = ['res']
+        }
+    }
+    externalNativeBuild {
+        cmake {
+            path "CMakeLists.txt"
+        }
+    }
+    androidResources {
+        ignoreAssetsPattern "XrLayer_gfxreconstruct.json"
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.0'
+    implementation project(':layer')
+}
diff --git a/android/tools/multi-win-replay/proguard-rules.pro b/android/tools/multi-win-replay/proguard-rules.pro
new file mode 100644
index 0000000..f1b4245
--- /dev/null
+++ b/android/tools/multi-win-replay/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/android/tools/multi-win-replay/res/drawable-v24/ic_launcher_foreground.xml b/android/tools/multi-win-replay/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 0000000..1f6bb29
--- /dev/null
+++ b/android/tools/multi-win-replay/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
diff --git a/android/tools/multi-win-replay/res/drawable/ic_launcher_background.xml b/android/tools/multi-win-replay/res/drawable/ic_launcher_background.xml
new file mode 100644
index 0000000..0d025f9
--- /dev/null
+++ b/android/tools/multi-win-replay/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#008577"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
diff --git a/android/tools/multi-win-replay/res/mipmap-anydpi-v26/ic_launcher.xml b/android/tools/multi-win-replay/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..eca70cf
--- /dev/null
+++ b/android/tools/multi-win-replay/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/android/tools/multi-win-replay/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/tools/multi-win-replay/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000..eca70cf
--- /dev/null
+++ b/android/tools/multi-win-replay/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/android/tools/multi-win-replay/res/mipmap-hdpi/ic_launcher.png b/android/tools/multi-win-replay/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..898f3ed
Binary files /dev/null and b/android/tools/multi-win-replay/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/tools/multi-win-replay/res/mipmap-hdpi/ic_launcher_round.png b/android/tools/multi-win-replay/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..dffca36
Binary files /dev/null and b/android/tools/multi-win-replay/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/android/tools/multi-win-replay/res/mipmap-mdpi/ic_launcher.png b/android/tools/multi-win-replay/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..64ba76f
Binary files /dev/null and b/android/tools/multi-win-replay/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/tools/multi-win-replay/res/mipmap-mdpi/ic_launcher_round.png b/android/tools/multi-win-replay/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..dae5e08
Binary files /dev/null and b/android/tools/multi-win-replay/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/android/tools/multi-win-replay/res/mipmap-xhdpi/ic_launcher.png b/android/tools/multi-win-replay/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..e5ed465
Binary files /dev/null and b/android/tools/multi-win-replay/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/tools/multi-win-replay/res/mipmap-xhdpi/ic_launcher_round.png b/android/tools/multi-win-replay/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..14ed0af
Binary files /dev/null and b/android/tools/multi-win-replay/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/android/tools/multi-win-replay/res/mipmap-xxhdpi/ic_launcher.png b/android/tools/multi-win-replay/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..b0907ca
Binary files /dev/null and b/android/tools/multi-win-replay/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/tools/multi-win-replay/res/mipmap-xxhdpi/ic_launcher_round.png b/android/tools/multi-win-replay/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..d8ae031
Binary files /dev/null and b/android/tools/multi-win-replay/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/android/tools/multi-win-replay/res/mipmap-xxxhdpi/ic_launcher.png b/android/tools/multi-win-replay/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..2c18de9
Binary files /dev/null and b/android/tools/multi-win-replay/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/tools/multi-win-replay/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/tools/multi-win-replay/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..beed3cd
Binary files /dev/null and b/android/tools/multi-win-replay/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/android/tools/multi-win-replay/res/values-v27/styles.xml b/android/tools/multi-win-replay/res/values-v27/styles.xml
new file mode 100644
index 0000000..2d9748d
--- /dev/null
+++ b/android/tools/multi-win-replay/res/values-v27/styles.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme" parent="@android:style/Theme.NoTitleBar.Fullscreen">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/android/tools/multi-win-replay/res/values/colors.xml b/android/tools/multi-win-replay/res/values/colors.xml
new file mode 100644
index 0000000..69b2233
--- /dev/null
+++ b/android/tools/multi-win-replay/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#008577</color>
+    <color name="colorPrimaryDark">#00574B</color>
+    <color name="colorAccent">#D81B60</color>
+</resources>
diff --git a/android/tools/multi-win-replay/res/values/strings.xml b/android/tools/multi-win-replay/res/values/strings.xml
new file mode 100644
index 0000000..5a2db75
--- /dev/null
+++ b/android/tools/multi-win-replay/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">gfxrecon-replay</string>
+</resources>
diff --git a/android/tools/multi-win-replay/res/values/styles.xml b/android/tools/multi-win-replay/res/values/styles.xml
new file mode 100644
index 0000000..4caddd6
--- /dev/null
+++ b/android/tools/multi-win-replay/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="@android:style/Theme.NoTitleBar.Fullscreen">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
diff --git a/android/tools/multi-win-replay/src/main/com/lunarg/gfxreconstruct/replay/ReplayActivity.java b/android/tools/multi-win-replay/src/main/com/lunarg/gfxreconstruct/replay/ReplayActivity.java
new file mode 100644
index 0000000..93f161b
--- /dev/null
+++ b/android/tools/multi-win-replay/src/main/com/lunarg/gfxreconstruct/replay/ReplayActivity.java
@@ -0,0 +1,143 @@
+/*
+** Copyright (c) 2025 LunarG, Inc.
+** Copyright (c) 2025 Arm Limited and/or its affiliates <[e-mail]>
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and associated documentation files (the "Software"),
+** to deal in the Software without restriction, including without limitation
+** the rights to use, copy, modify, merge, publish, distribute, sublicense,
+** and/or sell copies of the Software, and to permit persons to whom the
+** Software is furnished to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice shall be included in
+** all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+** FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+*/
+
+package com.lunarg.gfxreconstruct.replay;
+import java.util.List;
+import java.util.ArrayList;
+import android.app.NativeActivity;
+import android.os.Bundle;
+import android.widget.FrameLayout;
+import android.view.SurfaceView;
+import android.view.SurfaceHolder;
+import android.view.ViewGroup.LayoutParams;
+import android.view.Surface;
+import android.util.Log;
+import android.content.Context;
+import android.view.View;
+
+public class ReplayActivity extends NativeActivity
+{
+    private FrameLayout         mFrameLayout;
+    private static final String TAG = "gfxrecon";
+    private Surface             mSurface;
+    public native void          setSurface(Surface surface);
+    private List<VKSurfaceView> mSurfaceviewList = new ArrayList<VKSurfaceView>();
+
+    @Override protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+
+        // Create a FrameLayout to hold SurfaceView instances
+        mFrameLayout = new FrameLayout(this);
+        setContentView(mFrameLayout);
+
+        System.loadLibrary("gfxrecon-replay");
+    }
+
+    private class VKSurfaceView extends SurfaceView implements SurfaceHolder.Callback
+    {
+        private int width;
+        private int height;
+
+        public VKSurfaceView(Context context, int w, int h)
+        {
+            super(context);
+
+            width  = w;
+            height = h;
+
+            SurfaceHolder holder = getHolder();
+            holder.addCallback(this);
+        }
+
+        @Override public void surfaceCreated(SurfaceHolder holder)
+        {
+            mSurface = holder.getSurface();
+            Log.i(TAG, "SurfaceHolder.Callback: surfaceCreated:" + mSurface);
+        }
+
+        @Override public void surfaceDestroyed(SurfaceHolder holder)
+        {
+            Log.i(TAG, "SurfaceHolder.Callback: surfaceDestroyed:" + holder.getSurface());
+        }
+
+        @Override public void surfaceChanged(SurfaceHolder holder, int format, int w, int h)
+        {
+            Log.i(TAG, "SurfaceHolder.Callback: surfaceChanged:" + holder.getSurface() + " " + w + " " + h);
+        }
+    }
+
+    public void addNewView(int width, int height)
+    {
+        // Create a new SurfaceView
+        final Context context = this;
+        final int     wid     = width;
+        final int     hei     = height;
+        mSurface              = null;
+        runOnUiThread(new Runnable() {
+            @Override public void run()
+            {
+                System.loadLibrary("gfxrecon-replay");
+                VKSurfaceView newSurfaceView = new VKSurfaceView(context, wid, hei);
+                mFrameLayout.addView(newSurfaceView,
+                                    new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+                Log.i(TAG,
+                      "Create a new surface view:"
+                          + " width:" + wid + " height:" + hei);
+                mSurfaceviewList.add(newSurfaceView);
+            }
+        });
+        while (mSurface == null)
+        {
+            try
+            {
+                Thread.sleep(100);
+            }
+            catch (Exception e)
+            {
+                Log.w(TAG, "Create new surface failed");
+                e.printStackTrace();
+            }
+        }
+        setSurface(mSurface);
+    }
+
+    private void removeOneView(int surface_idx)
+    {
+        final int sur_idx = surface_idx;
+        runOnUiThread(new Runnable() {
+            @Override public void run()
+            {
+                if (mFrameLayout != null)
+                {
+                    Log.i(TAG, "Remove one view");
+                    mFrameLayout.removeView(mSurfaceviewList.get(sur_idx));
+                }
+                else
+                {
+                    Log.w(TAG, "View container has been destroyed!");
+                }
+            }
+        });
+    }
+}
diff --git a/android/tools/quest_replay/.gitignore b/android/tools/quest_replay/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/android/tools/quest_replay/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/android/tools/quest_replay/CMakeLists.txt b/android/tools/quest_replay/CMakeLists.txt
new file mode 100644
index 0000000..0331865
--- /dev/null
+++ b/android/tools/quest_replay/CMakeLists.txt
@@ -0,0 +1,68 @@
+cmake_minimum_required(VERSION 3.4.1)
+
+project(gfxrecon-quest-replay)
+
+# For more information about using CMake with Android Studio, read the
+# documentation: https://d.android.com/studio/projects/add-native-code.html
+option(GFXRECON_ENABLE_OPENXR "Enable OpenXR support." ON)
+get_filename_component(GFXRECON_SOURCE_DIR ../../.. ABSOLUTE)
+
+if (GFXRECON_ENABLE_OPENXR)
+# Only supported when OpenXr support
+
+get_filename_component(GFXRECON_SOURCE_DIR ../../.. ABSOLUTE)
+include(../../framework/cmake-config/PlatformConfig.cmake)
+
+cmake_minimum_required(VERSION 3.4.1)
+
+
+# Enable OpenXR support for quest_replay or fail
+include("FindOpenXRVersion")
+if ((NOT XR_VERSION_MAJOR STREQUAL "") AND (NOT XR_VERSION_MINOR STREQUAL ""))
+    message(STATUS "OpenXR support enabled")
+    set(OPENXR_SUPPORT_ENABLED TRUE)
+else()
+    message(FATAL_ERROR "Failed to find OpenXR headers for support.  Continuing with it disabled!")
+endif()
+
+add_subdirectory(../../framework/util ${PROJECT_SOURCE_DIR}/../../framework/util/build/tools/quest_replay/${ANDROID_ABI})
+add_subdirectory(../../framework/graphics ${PROJECT_SOURCE_DIR}/../../framework/graphics/build/tools/quest_replay/${ANDROID_ABI})
+add_subdirectory(../../framework/format ${PROJECT_SOURCE_DIR}/../../framework/format/build/tools/quest_replay/${ANDROID_ABI})