From 503b159f18bb16db167faa44fbab54e39ee1886b Mon Sep 17 00:00:00 2001
From: Jian Chen <cjian@microsoft.com>
Date: Thu, 6 Feb 2025 18:49:15 -0800
Subject: [PATCH] undo Binary c-api-cpu.yml 2

---
 .../azure-pipelines/templates/c-api-cpu.yml   | 81 +++++++++----------
 1 file changed, 40 insertions(+), 41 deletions(-)

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 621672ac71..e20922aed4 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
@@ -66,47 +66,46 @@ stages:
     BuildId: ${{ parameters.BuildId }}
     DoEsrp: ${{ parameters.DoEsrp }}
 
-#------ Commented out jobs -----
-#- stage: Android_Java_API_AAR_Packaging_Full
-#  dependsOn: Setup # Setup stage defined in set_packaging_variables_stage.yml creates the ReleaseVersionSuffix variable
-#  variables:
-#    ReleaseVersionSuffix: $[stageDependencies.Setup.Set_Variables.outputs['Set_Release_Version_Suffix.ReleaseVersionSuffix']]
-#  jobs:
-#  - template: android-java-api-aar.yml
-#    parameters:
-#      buildConfig: 'Release'
-#      buildSettings: '$(Build.SourcesDirectory)/tools/ci_build/github/android/default_full_aar_build_settings.json'
-#      artifactName: 'onnxruntime-android-full-aar'
-#      job_name_suffix: 'Full'
-#      publish_executables: '1'
-#      enable_code_sign: ${{ parameters.DoEsrp }}
-#      packageName: 'onnxruntime-android'
-#      ReleaseVersionSuffix: $(ReleaseVersionSuffix)
-#
-#- stage: Android_Java_API_AAR_Testing_Full
-#  dependsOn: Android_Java_API_AAR_Packaging_Full
-#  jobs:
-#  - template: android-java-api-aar-test.yml
-#    parameters:
-#      artifactName: 'onnxruntime-android-full-aar'
-#      ReleaseVersionSuffix: $(ReleaseVersionSuffix)
-#
-#- stage: Android_Java_API_AAR_Packaging_QNN
-#  dependsOn: Setup # Setup stage defined in set_packaging_variables_stage.yml creates the ReleaseVersionSuffix variable
-#  variables:
-#    ReleaseVersionSuffix: $[stageDependencies.Setup.Set_Variables.outputs['Set_Release_Version_Suffix.ReleaseVersionSuffix']]
-#  jobs:
-#  - template: android-java-api-aar.yml
-#    parameters:
-#      buildConfig: 'Release'
-#      buildSettings: '$(Build.SourcesDirectory)/tools/ci_build/github/android/default_qnn_aar_build_settings.json'
-#      artifactName: 'onnxruntime-android-qnn-aar'
-#      job_name_suffix: 'QNN'
-#      publish_executables: '0'
-#      enable_code_sign: ${{ parameters.DoEsrp }}
-#      packageName: 'onnxruntime-android-qnn'
-#      ReleaseVersionSuffix: $(ReleaseVersionSuffix)
-#      QnnSDKVersion: ${{ parameters.QnnSDKVersion }}
+- stage: Android_Java_API_AAR_Packaging_Full
+  dependsOn: Setup # Setup stage defined in set_packaging_variables_stage.yml creates the ReleaseVersionSuffix variable
+  variables:
+    ReleaseVersionSuffix: $[stageDependencies.Setup.Set_Variables.outputs['Set_Release_Version_Suffix.ReleaseVersionSuffix']]
+  jobs:
+  - template: android-java-api-aar.yml
+    parameters:
+      buildConfig: 'Release'
+      buildSettings: '$(Build.SourcesDirectory)/tools/ci_build/github/android/default_full_aar_build_settings.json'
+      artifactName: 'onnxruntime-android-full-aar'
+      job_name_suffix: 'Full'
+      publish_executables: '1'
+      enable_code_sign: ${{ parameters.DoEsrp }}
+      packageName: 'onnxruntime-android'
+      ReleaseVersionSuffix: $(ReleaseVersionSuffix)
+
+- stage: Android_Java_API_AAR_Testing_Full
+  dependsOn: Android_Java_API_AAR_Packaging_Full
+  jobs:
+  - template: android-java-api-aar-test.yml
+    parameters:
+      artifactName: 'onnxruntime-android-full-aar'
+      ReleaseVersionSuffix: $(ReleaseVersionSuffix)
+
+- stage: Android_Java_API_AAR_Packaging_QNN
+  dependsOn: Setup # Setup stage defined in set_packaging_variables_stage.yml creates the ReleaseVersionSuffix variable
+  variables:
+    ReleaseVersionSuffix: $[stageDependencies.Setup.Set_Variables.outputs['Set_Release_Version_Suffix.ReleaseVersionSuffix']]
+  jobs:
+  - template: android-java-api-aar.yml
+    parameters:
+      buildConfig: 'Release'
+      buildSettings: '$(Build.SourcesDirectory)/tools/ci_build/github/android/default_qnn_aar_build_settings.json'
+      artifactName: 'onnxruntime-android-qnn-aar'
+      job_name_suffix: 'QNN'
+      publish_executables: '0'
+      enable_code_sign: ${{ parameters.DoEsrp }}
+      packageName: 'onnxruntime-android-qnn'
+      ReleaseVersionSuffix: $(ReleaseVersionSuffix)
+      QnnSDKVersion: ${{ parameters.QnnSDKVersion }}
 #----- Commented out stages -----
 
 #- stage: Final_AAR_Testing_Android_QNN