From ca6afcba486d7da6b44e73fdc96d29cb801d17ce Mon Sep 17 00:00:00 2001
From: Sheetal Kadam <shekadam@microsoft.com>
Date: Tue, 19 Nov 2024 11:47:39 -0800
Subject: [PATCH] override android qnn sdk version with pipeline param

---
 .../azure-pipelines/c-api-noopenmp-packaging-pipelines.yml | 3 ++-
 .../azure-pipelines/templates/android-java-api-aar.yml     | 7 +++++++
 .../github/azure-pipelines/templates/c-api-cpu.yml         | 7 +++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml b/tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml
index 069b803f436f3..798868f3b957e 100644
--- a/tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml
+++ b/tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml
@@ -62,7 +62,7 @@ parameters:
 - name: QnnSdk
   displayName: QNN SDK Version
   type: string
-  default: 2.28.2.241116
+  default: 2.28.0.241029
 
 resources:
   repositories:
@@ -112,6 +112,7 @@ stages:
     BuildVariant: 'default'
     SpecificArtifact: ${{ parameters.SpecificArtifact }}
     BuildId: ${{ parameters.BuildId }}
+    QnnSDKVersion: ${{ parameters.QnnSdk }}
 
 - template: stages/java-cuda-packaging-stage.yml
   parameters:
diff --git a/tools/ci_build/github/azure-pipelines/templates/android-java-api-aar.yml b/tools/ci_build/github/azure-pipelines/templates/android-java-api-aar.yml
index 51e47fde74bb2..c38736edd58f1 100644
--- a/tools/ci_build/github/azure-pipelines/templates/android-java-api-aar.yml
+++ b/tools/ci_build/github/azure-pipelines/templates/android-java-api-aar.yml
@@ -48,6 +48,11 @@ parameters:
   type: string
   default: ''
 
+- name: QnnSDKVersion
+  displayName: QNN SDK Version
+  type: string
+  default: '2.28.0.241029'
+
 jobs:
 - job: Android_Java_API_AAR_Packaging_${{ parameters.job_name_suffix }}
   timeoutInMinutes: 120
@@ -85,6 +90,8 @@ jobs:
 
   - ${{ if contains(parameters.packageName, 'qnn') }}:
     - template: jobs/download_linux_qnn_sdk.yml
+      parameters:
+        QnnSDKVersion: '${{parameters.QnnSDKVersion}}'
 
   - task: CmdLine@2
     displayName: Build Android AAR Packages
diff --git a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml
index ee6fc712161df..b105e919c5b12 100644
--- a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml
+++ b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml
@@ -48,6 +48,11 @@ parameters:
   type: string
   default: '0'
 
+- name: QnnSDKVersion
+  displayName: QNN SDK Version
+  type: string
+  default: 2.28.0.241029
+
 stages:
 - template: linux-cpu-packaging-pipeline.yml
   parameters:
@@ -98,12 +103,14 @@ stages:
       enable_code_sign: ${{ parameters.DoEsrp }}
       packageName: 'onnxruntime-android-qnn'
       ReleaseVersionSuffix: $(ReleaseVersionSuffix)
+      QnnSDKVersion: ${{ parameters.QnnSDKVersion }}
 
   - template: android-java-api-aar-test.yml
     parameters:
       artifactName: 'onnxruntime-android-qnn-aar'
       job_name_suffix: 'QNN'
       packageName: 'onnxruntime-android-qnn'
+      QnnSDKVersion: ${{ parameters.QnnSDKVersion }}
 
 - stage: iOS_Full_xcframework
   dependsOn: []