From 6d626f21c3a2a1f572d3a686df52b6acd517ae03 Mon Sep 17 00:00:00 2001
From: Gregory Comer <gregoryjcomer@gmail.com>
Date: Sat, 16 Aug 2025 17:48:08 -0700
Subject: [PATCH 01/17] Update

[ghstack-poisoned]
---
 .ci/scripts/test_backend_linux.sh | 21 +++++++++++++++++----
 .github/workflows/nightly.yml     |  2 +-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.ci/scripts/test_backend_linux.sh b/.ci/scripts/test_backend_linux.sh
index 92f449b634a..85ce9887946 100755
--- a/.ci/scripts/test_backend_linux.sh
+++ b/.ci/scripts/test_backend_linux.sh
@@ -18,11 +18,24 @@ eval "$(conda shell.bash hook)"
 CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
 conda activate "${CONDA_ENV}"
 
-# Setup swiftshader and Vulkan SDK which are required to build the Vulkan delegate
-source .ci/scripts/setup-vulkan-linux-deps.sh
-
 # CMake options to use, in addition to the defaults.
-EXTRA_BUILD_ARGS="-DEXECUTORCH_BUILD_VULKAN=ON"
+EXTRA_BUILD_ARGS=""
+
+if [[ "$FLOW" == *"qualcomm"*]]
+    # Setup QNN sdk and deps
+    ./install_requirements.sh --use-pt-pinned-commit
+    PYTHON_EXECUTABLE=python bash .ci/scripts/setup-qnn-deps.sh
+    PYTHON_EXECUTABLE=python bash .ci/scripts/build-qnn-sdk.sh
+
+    EXTRA_BUILD_ARGS+=" -DEXECUTORCH_BUILD_QNN=ON"
+fi
+
+if [[ "$FLOW" == *"vulkan"*]]
+    # Setup swiftshader and Vulkan SDK which are required to build the Vulkan delegate
+    source .ci/scripts/setup-vulkan-linux-deps.sh
+    
+    EXTRA_BUILD_ARGS+=" -DEXECUTORCH_BUILD_VULKAN=ON"
+fi
 
 # We need the runner to test the built library.
 PYTHON_EXECUTABLE=python CMAKE_ARGS="$EXTRA_BUILD_ARGS" .ci/scripts/setup-linux.sh --build-tool cmake --build-mode Release
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 4c40311d9a9..3e8f1eaab39 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -42,7 +42,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        flow: [vulkan, xnnpack, xnnpack_static_int8_per_channel]
+        flow: [qualcomm, vulkan, xnnpack, xnnpack_static_int8_per_channel]
         suite: [models, operators]
     with:
       ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}

From 986d9f79bccb0e43dc56311a712a803cdf3e299b Mon Sep 17 00:00:00 2001
From: Gregory Comer <gregoryjcomer@gmail.com>
Date: Sat, 16 Aug 2025 17:59:09 -0700
Subject: [PATCH 02/17] Update

[ghstack-poisoned]
---
 .ci/scripts/test_backend_linux.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/scripts/test_backend_linux.sh b/.ci/scripts/test_backend_linux.sh
index 85ce9887946..f130d98eea0 100755
--- a/.ci/scripts/test_backend_linux.sh
+++ b/.ci/scripts/test_backend_linux.sh
@@ -21,7 +21,7 @@ conda activate "${CONDA_ENV}"
 # CMake options to use, in addition to the defaults.
 EXTRA_BUILD_ARGS=""
 
-if [[ "$FLOW" == *"qualcomm"*]]
+if [[ "$FLOW" =~ ".*qualcomm.*"]]
     # Setup QNN sdk and deps
     ./install_requirements.sh --use-pt-pinned-commit
     PYTHON_EXECUTABLE=python bash .ci/scripts/setup-qnn-deps.sh
@@ -30,7 +30,7 @@ if [[ "$FLOW" == *"qualcomm"*]]
     EXTRA_BUILD_ARGS+=" -DEXECUTORCH_BUILD_QNN=ON"
 fi
 
-if [[ "$FLOW" == *"vulkan"*]]
+if [[ "$FLOW" =~ ".*vulkan.*"]]
     # Setup swiftshader and Vulkan SDK which are required to build the Vulkan delegate
     source .ci/scripts/setup-vulkan-linux-deps.sh
     

From ff331d181ce33b09bd7d7ea2cf546e3427516bae Mon Sep 17 00:00:00 2001
From: Gregory Comer <gregoryjcomer@gmail.com>
Date: Sat, 16 Aug 2025 18:05:22 -0700
Subject: [PATCH 03/17] Update

[ghstack-poisoned]
---
 .ci/scripts/test_backend_linux.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/scripts/test_backend_linux.sh b/.ci/scripts/test_backend_linux.sh
index f130d98eea0..61f5c4ea4ef 100755
--- a/.ci/scripts/test_backend_linux.sh
+++ b/.ci/scripts/test_backend_linux.sh
@@ -21,7 +21,7 @@ conda activate "${CONDA_ENV}"
 # CMake options to use, in addition to the defaults.
 EXTRA_BUILD_ARGS=""
 
-if [[ "$FLOW" =~ ".*qualcomm.*"]]
+if [[ "$FLOW" =~ ".*qualcomm.*"]]; then
     # Setup QNN sdk and deps
     ./install_requirements.sh --use-pt-pinned-commit
     PYTHON_EXECUTABLE=python bash .ci/scripts/setup-qnn-deps.sh
@@ -30,7 +30,7 @@ if [[ "$FLOW" =~ ".*qualcomm.*"]]
     EXTRA_BUILD_ARGS+=" -DEXECUTORCH_BUILD_QNN=ON"
 fi
 
-if [[ "$FLOW" =~ ".*vulkan.*"]]
+if [[ "$FLOW" =~ ".*vulkan.*"]]; then
     # Setup swiftshader and Vulkan SDK which are required to build the Vulkan delegate
     source .ci/scripts/setup-vulkan-linux-deps.sh
     

From 83c228a74104f1f3de6d953705b6795610f4e642 Mon Sep 17 00:00:00 2001
From: Gregory Comer <gregoryjcomer@gmail.com>
Date: Sat, 16 Aug 2025 18:17:14 -0700
Subject: [PATCH 04/17] Update

[ghstack-poisoned]
---
 .ci/scripts/test_backend_linux.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/scripts/test_backend_linux.sh b/.ci/scripts/test_backend_linux.sh
index 61f5c4ea4ef..01c64e4be4b 100755
--- a/.ci/scripts/test_backend_linux.sh
+++ b/.ci/scripts/test_backend_linux.sh
@@ -21,7 +21,7 @@ conda activate "${CONDA_ENV}"
 # CMake options to use, in addition to the defaults.
 EXTRA_BUILD_ARGS=""
 
-if [[ "$FLOW" =~ ".*qualcomm.*"]]; then
+if [[ "$FLOW" =~ ".*qualcomm.*" ]]; then
     # Setup QNN sdk and deps
     ./install_requirements.sh --use-pt-pinned-commit
     PYTHON_EXECUTABLE=python bash .ci/scripts/setup-qnn-deps.sh
@@ -30,7 +30,7 @@ if [[ "$FLOW" =~ ".*qualcomm.*"]]; then
     EXTRA_BUILD_ARGS+=" -DEXECUTORCH_BUILD_QNN=ON"
 fi
 
-if [[ "$FLOW" =~ ".*vulkan.*"]]; then
+if [[ "$FLOW" =~ ".*vulkan.*" ]]; then
     # Setup swiftshader and Vulkan SDK which are required to build the Vulkan delegate
     source .ci/scripts/setup-vulkan-linux-deps.sh
     

From 017d011901ccf099a611a1b92f2b7c73a9f9f6d9 Mon Sep 17 00:00:00 2001
From: Gregory Comer <gregoryjcomer@gmail.com>
Date: Sat, 16 Aug 2025 18:58:06 -0700
Subject: [PATCH 05/17] Update

[ghstack-poisoned]
---
 .ci/scripts/test_backend_linux.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/scripts/test_backend_linux.sh b/.ci/scripts/test_backend_linux.sh
index 01c64e4be4b..5d657601a0f 100755
--- a/.ci/scripts/test_backend_linux.sh
+++ b/.ci/scripts/test_backend_linux.sh
@@ -21,7 +21,7 @@ conda activate "${CONDA_ENV}"
 # CMake options to use, in addition to the defaults.
 EXTRA_BUILD_ARGS=""
 
-if [[ "$FLOW" =~ ".*qualcomm.*" ]]; then
+if [[ "$FLOW" == *qualcomm* ]]; then
     # Setup QNN sdk and deps
     ./install_requirements.sh --use-pt-pinned-commit
     PYTHON_EXECUTABLE=python bash .ci/scripts/setup-qnn-deps.sh
@@ -30,7 +30,7 @@ if [[ "$FLOW" =~ ".*qualcomm.*" ]]; then
     EXTRA_BUILD_ARGS+=" -DEXECUTORCH_BUILD_QNN=ON"
 fi
 
-if [[ "$FLOW" =~ ".*vulkan.*" ]]; then
+if [[ "$FLOW" =~ *vulkan* ]]; then
     # Setup swiftshader and Vulkan SDK which are required to build the Vulkan delegate
     source .ci/scripts/setup-vulkan-linux-deps.sh
     

From 9370958a327ec19e5df68f91f10dcae65431da51 Mon Sep 17 00:00:00 2001
From: Gregory Comer <gregoryjcomer@gmail.com>
Date: Sat, 16 Aug 2025 20:35:54 -0700
Subject: [PATCH 06/17] Update

[ghstack-poisoned]
---
 .ci/scripts/test_backend_linux.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/scripts/test_backend_linux.sh b/.ci/scripts/test_backend_linux.sh
index 5d657601a0f..5c3f3b00ce1 100755
--- a/.ci/scripts/test_backend_linux.sh
+++ b/.ci/scripts/test_backend_linux.sh
@@ -27,7 +27,7 @@ if [[ "$FLOW" == *qualcomm* ]]; then
     PYTHON_EXECUTABLE=python bash .ci/scripts/setup-qnn-deps.sh
     PYTHON_EXECUTABLE=python bash .ci/scripts/build-qnn-sdk.sh
 
-    EXTRA_BUILD_ARGS+=" -DEXECUTORCH_BUILD_QNN=ON"
+    EXTRA_BUILD_ARGS+=" -DEXECUTORCH_BUILD_QNN=ON -DQNN_SDK_ROOT=$QNN_SDK_ROOT"
 fi
 
 if [[ "$FLOW" =~ *vulkan* ]]; then

From 98a6e7675e705bbe313b5ff04dc7c302bf5ff02c Mon Sep 17 00:00:00 2001
From: Gregory Comer <gregoryjcomer@gmail.com>
Date: Sat, 16 Aug 2025 20:53:53 -0700
Subject: [PATCH 07/17] Update

[ghstack-poisoned]
---
 .ci/scripts/test_backend_linux.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.ci/scripts/test_backend_linux.sh b/.ci/scripts/test_backend_linux.sh
index 5c3f3b00ce1..b3eda4c9791 100755
--- a/.ci/scripts/test_backend_linux.sh
+++ b/.ci/scripts/test_backend_linux.sh
@@ -18,14 +18,16 @@ eval "$(conda shell.bash hook)"
 CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
 conda activate "${CONDA_ENV}"
 
+export PYTHON_EXECUTABLE=python
+
 # CMake options to use, in addition to the defaults.
 EXTRA_BUILD_ARGS=""
 
 if [[ "$FLOW" == *qualcomm* ]]; then
     # Setup QNN sdk and deps
     ./install_requirements.sh --use-pt-pinned-commit
-    PYTHON_EXECUTABLE=python bash .ci/scripts/setup-qnn-deps.sh
-    PYTHON_EXECUTABLE=python bash .ci/scripts/build-qnn-sdk.sh
+    source .ci/scripts/setup-qnn-deps.sh
+    source .ci/scripts/build-qnn-sdk.sh
 
     EXTRA_BUILD_ARGS+=" -DEXECUTORCH_BUILD_QNN=ON -DQNN_SDK_ROOT=$QNN_SDK_ROOT"
 fi

From 927d00dfc999a1cf64f070e68a3499a5df40bf5b Mon Sep 17 00:00:00 2001
From: Gregory Comer <gregoryjcomer@gmail.com>
Date: Sat, 16 Aug 2025 21:27:14 -0700
Subject: [PATCH 08/17] Update

[ghstack-poisoned]
---
 backends/qualcomm/scripts/install_qnn_sdk.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backends/qualcomm/scripts/install_qnn_sdk.sh b/backends/qualcomm/scripts/install_qnn_sdk.sh
index 913ce34b711..78f8e228577 100644
--- a/backends/qualcomm/scripts/install_qnn_sdk.sh
+++ b/backends/qualcomm/scripts/install_qnn_sdk.sh
@@ -141,9 +141,9 @@ setup_libcpp() {
   popd >/dev/null
 
   # Set environment variables
-  export CPLUS_INCLUDE_PATH="${INSTALL_DIR}/include:$CPLUS_INCLUDE_PATH"
-  export LD_LIBRARY_PATH="${INSTALL_DIR}/lib:$LD_LIBRARY_PATH"
-  export LIBRARY_PATH="${INSTALL_DIR}/lib:$LIBRARY_PATH"
+  export CPLUS_INCLUDE_PATH="${INSTALL_DIR}/include:${CPLUS_INCLUDE_PATH:-}"
+  export LD_LIBRARY_PATH="${INSTALL_DIR}/lib:${LD_LIBRARY_PATH:-}"
+  export LIBRARY_PATH="${INSTALL_DIR}/lib:${LIBRARY_PATH:-}"
 
   echo "libc++ installed to ${INSTALL_DIR}"
 }

From 685f5b51bfd134ec63593ccd7512de5b06ad0c31 Mon Sep 17 00:00:00 2001
From: Gregory Comer <gregoryjcomer@gmail.com>
Date: Sat, 16 Aug 2025 21:45:22 -0700
Subject: [PATCH 09/17] Update

[ghstack-poisoned]
---
 backends/qualcomm/scripts/install_qnn_sdk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backends/qualcomm/scripts/install_qnn_sdk.sh b/backends/qualcomm/scripts/install_qnn_sdk.sh
index 78f8e228577..63984152159 100644
--- a/backends/qualcomm/scripts/install_qnn_sdk.sh
+++ b/backends/qualcomm/scripts/install_qnn_sdk.sh
@@ -9,7 +9,7 @@ source "${SCRIPT_DIR}/qnn_config.sh"
 # Function to install Android NDK (only if not already set)
 setup_android_ndk() {
     # Check if ANDROID_NDK_ROOT is already set and valid
-    if [ -n "${ANDROID_NDK_ROOT}" ] && [ -d "${ANDROID_NDK_ROOT}" ]; then
+    if [ -n "${ANDROID_NDK_ROOT:-}" ] && [ -d "${ANDROID_NDK_ROOT:-}" ]; then
         echo "Android NDK already set to ${ANDROID_NDK_ROOT} - skipping installation"
         return
     fi

From 52ca00c9661d6dd330d7370371f3c7ff89e7de2c Mon Sep 17 00:00:00 2001
From: Gregory Comer <gregoryjcomer@gmail.com>
Date: Sat, 16 Aug 2025 22:14:56 -0700
Subject: [PATCH 10/17] Update

[ghstack-poisoned]
---
 backends/qualcomm/scripts/install_qnn_sdk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backends/qualcomm/scripts/install_qnn_sdk.sh b/backends/qualcomm/scripts/install_qnn_sdk.sh
index 63984152159..a8f9e63862d 100644
--- a/backends/qualcomm/scripts/install_qnn_sdk.sh
+++ b/backends/qualcomm/scripts/install_qnn_sdk.sh
@@ -41,7 +41,7 @@ verify_pkg_installed() {
 
 install_qnn() {
   # Check if QNN_SDK_ROOT is already set and valid
-  if [ -n "${QNN_SDK_ROOT}" ] && [ -d "${QNN_SDK_ROOT}" ]; then
+  if [ -n "${QNN_SDK_ROOT:-}" ] && [ -d "${QNN_SDK_ROOT:-}" ]; then
     echo "QNN SDK already set to ${QNN_SDK_ROOT} - skipping installation"
     return
   fi

From 7f15e20d76a1e52186a17c05a45f2ad23d371381 Mon Sep 17 00:00:00 2001
From: Gregory Comer <gregoryjcomer@gmail.com>
Date: Sun, 17 Aug 2025 00:08:53 -0700
Subject: [PATCH 11/17] Update

[ghstack-poisoned]
---
 .github/workflows/nightly.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 3e8f1eaab39..f7f39fec4e9 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -47,7 +47,7 @@ jobs:
     with:
       ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       runner: linux.4xlarge.memory
-      docker-image: ci-image:executorch-ubuntu-22.04-clang12
+      docker-image: ci-image:executorch-ubuntu-22.04-qnn-sdk
       submodules: recursive
       timeout: 120
       upload-artifact: test-report-${{ matrix.flow }}-${{ matrix.suite }}

From 0cadcf429dc3bae9fb786de83eca8ba35eca8e67 Mon Sep 17 00:00:00 2001
From: Gregory Comer <gregoryjcomer@gmail.com>
Date: Sun, 17 Aug 2025 18:53:30 -0700
Subject: [PATCH 12/17] Update

[ghstack-poisoned]
---
 .ci/scripts/test_backend_linux.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.ci/scripts/test_backend_linux.sh b/.ci/scripts/test_backend_linux.sh
index b3eda4c9791..be7c1a2c1bd 100755
--- a/.ci/scripts/test_backend_linux.sh
+++ b/.ci/scripts/test_backend_linux.sh
@@ -25,11 +25,13 @@ EXTRA_BUILD_ARGS=""
 
 if [[ "$FLOW" == *qualcomm* ]]; then
     # Setup QNN sdk and deps
-    ./install_requirements.sh --use-pt-pinned-commit
-    source .ci/scripts/setup-qnn-deps.sh
-    source .ci/scripts/build-qnn-sdk.sh
+    # ./install_requirements.sh --use-pt-pinned-commit
+    PYTHON_EXECUTABLE=python bash .ci/scripts/setup-linux.sh --build-tool cmake
+    PYTHON_EXECUTABLE=python bash .ci/scripts/setup-qnn-deps.sh
+    PYTHON_EXECUTABLE=python bash .ci/scripts/build-qnn-sdk.sh
 
-    EXTRA_BUILD_ARGS+=" -DEXECUTORCH_BUILD_QNN=ON -DQNN_SDK_ROOT=$QNN_SDK_ROOT"
+    # TODO Get SDK root from install scripts
+    EXTRA_BUILD_ARGS+=" -DEXECUTORCH_BUILD_QNN=ON -DQNN_SDK_ROOT=/tmp/qnn/2.28.0.241029"
 fi
 
 if [[ "$FLOW" =~ *vulkan* ]]; then

From 3f064c088f99651c13dde7e46879b0092f0b25ca Mon Sep 17 00:00:00 2001
From: Gregory Comer <gregoryjcomer@gmail.com>
Date: Mon, 18 Aug 2025 00:21:00 -0700
Subject: [PATCH 13/17] Update

[ghstack-poisoned]
---
 .ci/scripts/test_backend_linux.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.ci/scripts/test_backend_linux.sh b/.ci/scripts/test_backend_linux.sh
index be7c1a2c1bd..f955a59822b 100755
--- a/.ci/scripts/test_backend_linux.sh
+++ b/.ci/scripts/test_backend_linux.sh
@@ -24,11 +24,13 @@ export PYTHON_EXECUTABLE=python
 EXTRA_BUILD_ARGS=""
 
 if [[ "$FLOW" == *qualcomm* ]]; then
-    # Setup QNN sdk and deps
-    # ./install_requirements.sh --use-pt-pinned-commit
+    # Setup QNN sdk and deps - note that this is a bit hacky due to the nature of the 
+    # Qualcomm build. TODO (gjcomer) Clean this up once the QNN pybinding integration is
+    # cleaned up.
     PYTHON_EXECUTABLE=python bash .ci/scripts/setup-linux.sh --build-tool cmake
     PYTHON_EXECUTABLE=python bash .ci/scripts/setup-qnn-deps.sh
     PYTHON_EXECUTABLE=python bash .ci/scripts/build-qnn-sdk.sh
+    export LD_LIBRARY_PATH=$EXECUTORCH_ROOT/build-x86/lib/:$LD_LIBRARY_PATH
 
     # TODO Get SDK root from install scripts
     EXTRA_BUILD_ARGS+=" -DEXECUTORCH_BUILD_QNN=ON -DQNN_SDK_ROOT=/tmp/qnn/2.28.0.241029"

From 66ab2d6492a72b3be8fb3877bc2b86c9d576e041 Mon Sep 17 00:00:00 2001
From: Gregory Comer <gregoryjcomer@gmail.com>
Date: Mon, 18 Aug 2025 00:50:25 -0700
Subject: [PATCH 14/17] Update

[ghstack-poisoned]
---
 .ci/scripts/test_backend_linux.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.ci/scripts/test_backend_linux.sh b/.ci/scripts/test_backend_linux.sh
index f955a59822b..ebedb444c15 100755
--- a/.ci/scripts/test_backend_linux.sh
+++ b/.ci/scripts/test_backend_linux.sh
@@ -30,7 +30,8 @@ if [[ "$FLOW" == *qualcomm* ]]; then
     PYTHON_EXECUTABLE=python bash .ci/scripts/setup-linux.sh --build-tool cmake
     PYTHON_EXECUTABLE=python bash .ci/scripts/setup-qnn-deps.sh
     PYTHON_EXECUTABLE=python bash .ci/scripts/build-qnn-sdk.sh
-    export LD_LIBRARY_PATH=$EXECUTORCH_ROOT/build-x86/lib/:$LD_LIBRARY_PATH
+    QNN_X86_LIB_DIR=`realpath build-x86/lib/`
+    export LD_LIBRARY_PATH=$QNN_X86_LIB_DIR:$LD_LIBRARY_PATH
 
     # TODO Get SDK root from install scripts
     EXTRA_BUILD_ARGS+=" -DEXECUTORCH_BUILD_QNN=ON -DQNN_SDK_ROOT=/tmp/qnn/2.28.0.241029"

From eea49a0ca11edc7bc5871e08c4912e49852acd19 Mon Sep 17 00:00:00 2001
From: Gregory Comer <gregoryjcomer@gmail.com>
Date: Mon, 18 Aug 2025 01:12:23 -0700
Subject: [PATCH 15/17] Update

[ghstack-poisoned]
---
 .ci/scripts/test_backend_linux.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/scripts/test_backend_linux.sh b/.ci/scripts/test_backend_linux.sh
index ebedb444c15..463d60aa928 100755
--- a/.ci/scripts/test_backend_linux.sh
+++ b/.ci/scripts/test_backend_linux.sh
@@ -31,7 +31,7 @@ if [[ "$FLOW" == *qualcomm* ]]; then
     PYTHON_EXECUTABLE=python bash .ci/scripts/setup-qnn-deps.sh
     PYTHON_EXECUTABLE=python bash .ci/scripts/build-qnn-sdk.sh
     QNN_X86_LIB_DIR=`realpath build-x86/lib/`
-    export LD_LIBRARY_PATH=$QNN_X86_LIB_DIR:$LD_LIBRARY_PATH
+    export LD_LIBRARY_PATH=$QNN_X86_LIB_DIR:${LD_LIBRARY_PATH:-}
 
     # TODO Get SDK root from install scripts
     EXTRA_BUILD_ARGS+=" -DEXECUTORCH_BUILD_QNN=ON -DQNN_SDK_ROOT=/tmp/qnn/2.28.0.241029"

From ca2c9b205d0adfe417565102842e2a6232665004 Mon Sep 17 00:00:00 2001
From: Gregory Comer <gregoryjcomer@gmail.com>
Date: Mon, 18 Aug 2025 01:38:26 -0700
Subject: [PATCH 16/17] Update

[ghstack-poisoned]
---
 .ci/scripts/test_backend_linux.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/scripts/test_backend_linux.sh b/.ci/scripts/test_backend_linux.sh
index 463d60aa928..2d0eb55d384 100755
--- a/.ci/scripts/test_backend_linux.sh
+++ b/.ci/scripts/test_backend_linux.sh
@@ -45,6 +45,6 @@ if [[ "$FLOW" =~ *vulkan* ]]; then
 fi
 
 # We need the runner to test the built library.
-PYTHON_EXECUTABLE=python CMAKE_ARGS="$EXTRA_BUILD_ARGS" .ci/scripts/setup-linux.sh --build-tool cmake --build-mode Release
+PYTHON_EXECUTABLE=python CMAKE_ARGS="$EXTRA_BUILD_ARGS" .ci/scripts/setup-linux.sh --build-tool cmake --build-mode Release --editable true
 
 python -m executorch.backends.test.suite.runner $SUITE --flow $FLOW --report "$ARTIFACT_DIR/test_results.csv"

From 42a664ed876e18d86161dcf8a52a6027ff2de9b9 Mon Sep 17 00:00:00 2001
From: Gregory Comer <gregoryjcomer@gmail.com>
Date: Mon, 18 Aug 2025 01:54:34 -0700
Subject: [PATCH 17/17] Update

[ghstack-poisoned]
---
 .ci/scripts/test_backend_linux.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.ci/scripts/test_backend_linux.sh b/.ci/scripts/test_backend_linux.sh
index 2d0eb55d384..2b9142f9f92 100755
--- a/.ci/scripts/test_backend_linux.sh
+++ b/.ci/scripts/test_backend_linux.sh
@@ -31,10 +31,11 @@ if [[ "$FLOW" == *qualcomm* ]]; then
     PYTHON_EXECUTABLE=python bash .ci/scripts/setup-qnn-deps.sh
     PYTHON_EXECUTABLE=python bash .ci/scripts/build-qnn-sdk.sh
     QNN_X86_LIB_DIR=`realpath build-x86/lib/`
-    export LD_LIBRARY_PATH=$QNN_X86_LIB_DIR:${LD_LIBRARY_PATH:-}
+    QNN_SDK_ROOT="/tmp/qnn/2.28.0.241029"
+    export LD_LIBRARY_PATH"=$QNN_X86_LIB_DIR:$QNN_SDK_ROOT/lib/x86_64-linux-clang/:${LD_LIBRARY_PATH:-}"
 
     # TODO Get SDK root from install scripts
-    EXTRA_BUILD_ARGS+=" -DEXECUTORCH_BUILD_QNN=ON -DQNN_SDK_ROOT=/tmp/qnn/2.28.0.241029"
+    EXTRA_BUILD_ARGS+=" -DEXECUTORCH_BUILD_QNN=ON -DQNN_SDK_ROOT=$QNN_SDK_ROOT"
 fi
 
 if [[ "$FLOW" =~ *vulkan* ]]; then