From 7934d663591a7ac93633bbbe7b9658b2d1f0daf3 Mon Sep 17 00:00:00 2001
From: Chen Lai <chenlai@meta.com>
Date: Mon, 12 Aug 2024 22:12:21 -0700
Subject: [PATCH 1/3] fix qnn docker build

---
 .ci/docker/ubuntu/Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.ci/docker/ubuntu/Dockerfile b/.ci/docker/ubuntu/Dockerfile
index 2aa9f24b677..c551a667fb8 100644
--- a/.ci/docker/ubuntu/Dockerfile
+++ b/.ci/docker/ubuntu/Dockerfile
@@ -83,9 +83,7 @@ COPY --chown=ci-user:ci-user ./arm /opt/arm
 RUN if [ -n "${ARM_SDK}" ]; then git config --global user.email "ossci@example.com"; git config --global user.name "OSS CI"; bash /opt/arm/setup.sh --i-agree-to-the-contained-eula /opt/arm-sdk; chown -R ci-user:ci-user /opt/arm-sdk; fi
 
 ARG QNN_SDK
-COPY --chown=ci-user:ci-user ./qualcomm /opt/qualcomm
-# Set up QNN SDK if needed
-RUN if [ -n "${QNN_SDK}" ]; then git config --global user.email "ossci@example.com"; git config --global user.name "OSS CI"; fi
+# TODO: run .ci/scripts/setup-qnn-deps.sh here
 
 USER ci-user
 CMD ["bash"]

From 55152295e754c05ab31f03c60af9add452625ef4 Mon Sep 17 00:00:00 2001
From: Chen Lai <chenlai@meta.com>
Date: Mon, 12 Aug 2024 22:45:45 -0700
Subject: [PATCH 2/3] rm docker build

---
 .ci/docker/build.sh         | 2 +-
 .github/workflows/trunk.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/docker/build.sh b/.ci/docker/build.sh
index 59d5daa8b8f..554f296fe8b 100755
--- a/.ci/docker/build.sh
+++ b/.ci/docker/build.sh
@@ -79,7 +79,7 @@ docker build \
   --build-arg "LINTRUNNER=${LINTRUNNER:-}" \
   --build-arg "BUILD_DOCS=${BUILD_DOCS}" \
   --build-arg "ARM_SDK=${ARM_SDK:-}" \
-  --build-arg "QNN_SDK=${QNN_SDK:-}" \
+  # --build-arg "QNN_SDK=${QNN_SDK:-}" \
   --build-arg "ANDROID_NDK_VERSION=${ANDROID_NDK_VERSION:-}" \
   -f "${OS}"/Dockerfile \
   "$@" \
diff --git a/.github/workflows/trunk.yml b/.github/workflows/trunk.yml
index 86e44e647da..db969936d7a 100644
--- a/.github/workflows/trunk.yml
+++ b/.github/workflows/trunk.yml
@@ -283,7 +283,7 @@ jobs:
       fail-fast: false
     with:
       runner: linux.2xlarge
-      docker-image: executorch-ubuntu-22.04-qnn-sdk
+      docker-image: executorch-ubuntu-22.04-clang12-android
       submodules: 'true'
       ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout: 900

From edad84000f9de2bd78047ff85506a2b50832276e Mon Sep 17 00:00:00 2001
From: Chen Lai <chenlai@meta.com>
Date: Mon, 12 Aug 2024 22:47:23 -0700
Subject: [PATCH 3/3] complete remove

---
 .ci/docker/build.sh          | 5 -----
 .ci/docker/ubuntu/Dockerfile | 3 ---
 2 files changed, 8 deletions(-)

diff --git a/.ci/docker/build.sh b/.ci/docker/build.sh
index 554f296fe8b..ecbe7af3246 100755
--- a/.ci/docker/build.sh
+++ b/.ci/docker/build.sh
@@ -37,10 +37,6 @@ case "${IMAGE_NAME}" in
     ARM_SDK=yes
     CLANG_VERSION=12
     ;;
-  executorch-ubuntu-22.04-qnn-sdk)
-    QNN_SDK=yes
-    CLANG_VERSION=12
-    ;;
   executorch-ubuntu-22.04-clang12-android)
     LINTRUNNER=""
     CLANG_VERSION=12
@@ -79,7 +75,6 @@ docker build \
   --build-arg "LINTRUNNER=${LINTRUNNER:-}" \
   --build-arg "BUILD_DOCS=${BUILD_DOCS}" \
   --build-arg "ARM_SDK=${ARM_SDK:-}" \
-  # --build-arg "QNN_SDK=${QNN_SDK:-}" \
   --build-arg "ANDROID_NDK_VERSION=${ANDROID_NDK_VERSION:-}" \
   -f "${OS}"/Dockerfile \
   "$@" \
diff --git a/.ci/docker/ubuntu/Dockerfile b/.ci/docker/ubuntu/Dockerfile
index c551a667fb8..449cd14b6b4 100644
--- a/.ci/docker/ubuntu/Dockerfile
+++ b/.ci/docker/ubuntu/Dockerfile
@@ -82,8 +82,5 @@ COPY --chown=ci-user:ci-user ./arm /opt/arm
 # Set up ARM SDK if needed
 RUN if [ -n "${ARM_SDK}" ]; then git config --global user.email "ossci@example.com"; git config --global user.name "OSS CI"; bash /opt/arm/setup.sh --i-agree-to-the-contained-eula /opt/arm-sdk; chown -R ci-user:ci-user /opt/arm-sdk; fi
 
-ARG QNN_SDK
-# TODO: run .ci/scripts/setup-qnn-deps.sh here
-
 USER ci-user
 CMD ["bash"]