From 9d92202a08db704470bc0a8eb04bd7b40003cdfb Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei03@shengwang.cn>
Date: Wed, 16 Apr 2025 18:11:57 +0800
Subject: [PATCH 01/10] [Android]test ci.

---
 .github/ci/build/build_android.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/ci/build/build_android.sh b/.github/ci/build/build_android.sh
index 233b4bb01..6f48f84c9 100644
--- a/.github/ci/build/build_android.sh
+++ b/.github/ci/build/build_android.sh
@@ -49,9 +49,12 @@ echo release_version: $release_version
 echo short_version: $short_version
 echo pwd: `pwd`
 echo sdk_url: $sdk_url
+
 unzip_name=Agora_Native_SDK_for_Android_FULL_DEFAULT
 zip_name=Agora_Native_SDK_for_Android_FULL_DEFAULT.zip
-if [ -z "$sdk_url" ]; then
+
+
+if [ -z "$sdk_url" ] || [ "$sdk_url" == "none" ]; then
    echo "sdk_url is empty"
    echo unzip_name: $unzip_name 
    echo zip_name: $zip_name
@@ -85,7 +88,7 @@ if [ $compile_project = true ]; then
 	export ANDROID_HOME=/usr/lib/android_sdk
 	echo ANDROID_HOME: $ANDROID_HOME
 	cd ./$unzip_name/rtc/samples/API-Example || exit 1
-	if [ -z "$sdk_url" ]; then
+	if [ -z "$sdk_url" ] || [ "$sdk_url" == "none" ]; then
 		./cloud_build.sh false || exit 1
 	else
 		./cloud_build.sh true || exit 1

From 8c7cdc5454654ce6866fc447a2ec71a31c245b14 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei03@shengwang.cn>
Date: Thu, 17 Apr 2025 14:26:27 +0800
Subject: [PATCH 02/10] [Android]test ci.

---
 .github/ci/build/build_android.sh | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/.github/ci/build/build_android.sh b/.github/ci/build/build_android.sh
index 1beea3ebd..e5c79f71e 100644
--- a/.github/ci/build/build_android.sh
+++ b/.github/ci/build/build_android.sh
@@ -75,9 +75,22 @@ else
 	rm -rf ./$unzip_name/pom
 fi
 mkdir -p ./$unzip_name/rtc/samples 
-cp -rf ./Android/${android_direction} ./$unzip_name/rtc/samples/API-Example || exit 1
-7za a -tzip result.zip -r $unzip_name > log.txt
-mv result.zip $WORKSPACE/withAPIExample_${BUILD_NUMBER}_$zip_name
+cp -rf ./Android/${android_direction} ./$unzip_name/rtc/samples/${android_direction} || exit 1
+
+if [ $generate_project = true ]; then
+	if [ $is_cn = true ]; then
+		cd ./$unzip_name/rtc/samples/${android_direction}  || exit 1
+		sed -ie "s#google()#maven { url \"https\://maven.aliyun.com/repository/public\" }\n        google()#g" settings.gradle
+		sed -ie "s#https://services.gradle.org/distributions#https://mirrors.cloud.tencent.com/gradle#g" gradle/wrapper/gradle-wrapper.properties
+		cd $WORKSPACE  # 返回工作目录
+	fi
+
+	7za a -tzip result.zip -r $unzip_name > log.txt
+	mv result.zip $WORKSPACE/${android_direction}_${BUILD_NUMBER}_$zip_name
+else
+	7za a -tzip result.zip -r $unzip_name > log.txt
+	mv result.zip $WORKSPACE/${android_direction}_${BUILD_NUMBER}_$zip_name
+fi
 
 if [ $compile_project = true ]; then
 	# install android sdk
@@ -86,7 +99,7 @@ if [ $compile_project = true ]; then
 	source ~/.bashrc
 	export ANDROID_HOME=/usr/lib/android_sdk
 	echo ANDROID_HOME: $ANDROID_HOME
-	cd ./$unzip_name/rtc/samples/API-Example || exit 1
+	cd ./$unzip_name/rtc/samples/${android_direction}  || exit 1
 	if [ -z "$sdk_url" ] || [ "$sdk_url" == "none" ]; then
 		./cloud_build.sh false || exit 1
 	else

From d9d124d35d3bddd3c44331208ba6b576efdd3ead Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei03@shengwang.cn>
Date: Thu, 24 Apr 2025 11:25:47 +0800
Subject: [PATCH 03/10] [Android] update ci

---
 .github/ci/build/build_android.groovy |  3 +--
 .github/ci/build/build_android.sh     | 37 ++++++++++++++-------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.github/ci/build/build_android.groovy b/.github/ci/build/build_android.groovy
index fc7fc2103..8d3c152de 100644
--- a/.github/ci/build/build_android.groovy
+++ b/.github/ci/build/build_android.groovy
@@ -7,7 +7,6 @@ buildUtils = new agora.build.BuildUtils()
 
 compileConfig = [
     "sourceDir": "api-examples",
-    "docker": "hub.agoralab.co/server/apiexample_build_android:latest",
     "non-publish": [
         "command": "./.github/ci/build/build_android.sh",
         "extraArgs": "",
@@ -64,4 +63,4 @@ def doPublish(buildVariables) {
     sh "rm -rf *.zip *.apk || true"
 }
 
-pipelineLoad(this, "ApiExample", "build", "android", "apiexample_linux")
+pipelineLoad(this, "ApiExample", "build", "android", "RTC-Sample")
diff --git a/.github/ci/build/build_android.sh b/.github/ci/build/build_android.sh
index e5c79f71e..e540ad070 100644
--- a/.github/ci/build/build_android.sh
+++ b/.github/ci/build/build_android.sh
@@ -17,6 +17,7 @@
 # 'platform: string',
 # 'BUILD_NUMBER: string',
 # 'WORKSPACE: string'
+# 'compress_apiexample:boolean:false'
 #
 # --- Test Related: ---
 #   PR build, zip test related to test.zip
@@ -49,10 +50,9 @@ echo release_version: $release_version
 echo short_version: $short_version
 echo pwd: `pwd`
 echo sdk_url: $sdk_url
-
+echo compress_apiexample: $compress_apiexample
 unzip_name=Agora_Native_SDK_for_Android_FULL_DEFAULT
 zip_name=Agora_Native_SDK_for_Android_FULL_DEFAULT.zip
-
 if [ -z "$sdk_url" ] || [ "$sdk_url" == "none" ]; then
    echo "sdk_url is empty"
    echo unzip_name: $unzip_name 
@@ -74,22 +74,25 @@ else
 	rm ./$unzip_name/rtc/package_size_report.txt
 	rm -rf ./$unzip_name/pom
 fi
-mkdir -p ./$unzip_name/rtc/samples 
-cp -rf ./Android/${android_direction} ./$unzip_name/rtc/samples/${android_direction} || exit 1
 
-if [ $generate_project = true ]; then
-	if [ $is_cn = true ]; then
-		cd ./$unzip_name/rtc/samples/${android_direction}  || exit 1
-		sed -ie "s#google()#maven { url \"https\://maven.aliyun.com/repository/public\" }\n        google()#g" settings.gradle
-		sed -ie "s#https://services.gradle.org/distributions#https://mirrors.cloud.tencent.com/gradle#g" gradle/wrapper/gradle-wrapper.properties
-		cd $WORKSPACE  # 返回工作目录
-	fi
+# Create API-Example directory and copy files
+mkdir -p ./$unzip_name/rtc/samples 
+cp -rf ./Android/${android_direction} ./$unzip_name/rtc/samples/API-Example || exit 1
 
-	7za a -tzip result.zip -r $unzip_name > log.txt
-	mv result.zip $WORKSPACE/${android_direction}_${BUILD_NUMBER}_$zip_name
+# Decide how to package based on compress_apiexample parameter
+if [ "$compress_apiexample" = "true" ]; then
+	# Only compress API-Example code
+	echo "Only compressing API-Example code"
+	mkdir -p ./temp_apiexample/rtc/samples
+	cp -rf ./$unzip_name/rtc/samples/API-Example ./temp_apiexample/rtc/samples/ || exit 1
+	7za a -tzip result.zip -r temp_apiexample > log.txt
+	rm -rf ./temp_apiexample
+	mv result.zip $WORKSPACE/apiExample_${BUILD_NUMBER}_$zip_name
 else
+	# Compress the entire SDK including API-Example
+	echo "Compressing the entire SDK including API-Example"
 	7za a -tzip result.zip -r $unzip_name > log.txt
-	mv result.zip $WORKSPACE/${android_direction}_${BUILD_NUMBER}_$zip_name
+	mv result.zip $WORKSPACE/withAPIExample_${BUILD_NUMBER}_$zip_name
 fi
 
 if [ $compile_project = true ]; then
@@ -99,12 +102,10 @@ if [ $compile_project = true ]; then
 	source ~/.bashrc
 	export ANDROID_HOME=/usr/lib/android_sdk
 	echo ANDROID_HOME: $ANDROID_HOME
-	cd ./$unzip_name/rtc/samples/${android_direction}  || exit 1
+	cd ./$unzip_name/rtc/samples/API-Example || exit 1
 	if [ -z "$sdk_url" ] || [ "$sdk_url" == "none" ]; then
 		./cloud_build.sh false || exit 1
 	else
 		./cloud_build.sh true || exit 1
 	fi
-fi
-
-
+fi
\ No newline at end of file

From 62e89a0e97072455bf1e0b812f7e011fde6d62f2 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei03@shengwang.cn>
Date: Thu, 24 Apr 2025 11:38:27 +0800
Subject: [PATCH 04/10] [Android] ci config env.

---
 Android/APIExample-Audio/cloud_build.sh   | 29 ++++++++++++++++++-----
 Android/APIExample-Compose/cloud_build.sh | 29 ++++++++++++++++++-----
 Android/APIExample/cloud_build.sh         | 29 ++++++++++++++++++-----
 3 files changed, 69 insertions(+), 18 deletions(-)

diff --git a/Android/APIExample-Audio/cloud_build.sh b/Android/APIExample-Audio/cloud_build.sh
index 07dcaaa5e..f4e8ffe1b 100755
--- a/Android/APIExample-Audio/cloud_build.sh
+++ b/Android/APIExample-Audio/cloud_build.sh
@@ -6,14 +6,31 @@ ls ~/.gradle || (mkdir -p /tmp/.gradle && ln -s /tmp/.gradle ~/.gradle && touch
 ## use open jdk 17
 SYSTEM=$(uname -s)
 if [ "$SYSTEM" = "Linux" ];then
-if [ ! -d "/tmp/jdk-17.0.2" ];then
-  curl -O https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_linux-x64_bin.tar.gz
-  tar zxf openjdk-17.0.2_linux-x64_bin.tar.gz
-  mv jdk-17.0.2 /tmp/
+  if [ ! -d "/tmp/jdk-17.0.2" ];then
+    curl -O https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_linux-x64_bin.tar.gz
+    tar zxf openjdk-17.0.2_linux-x64_bin.tar.gz
+    mv jdk-17.0.2 /tmp/
+  fi
+  export JAVA_HOME=/tmp/jdk-17.0.2
+  export ANDROID_HOME=/usr/lib/android_sdk
+elif [ "$SYSTEM" = "Darwin" ];then
+  export JAVA_HOME=$(/usr/libexec/java_home -v 17)
+  export ANDROID_HOME=${ANDROID_HOME:-$HOME/Library/Android/sdk}
 fi
-export JAVA_HOME=/tmp/jdk-17.0.2
+
 export PATH=$JAVA_HOME/bin:$PATH
-java --version
+java --version || { echo "Error: Failed to get Java version"; exit 1; }
+
+# Configure environment
+if [ "$SYSTEM" = "Linux" ];then
+  [ -f ~/.bashrc ] && source ~/.bashrc
+else
+  # Try to load zsh config first, if not found then try bash_profile
+  if [ -f ~/.zshrc ]; then
+    source ~/.zshrc
+  elif [ -f ~/.bash_profile ]; then
+    source ~/.bash_profile
+  fi
 fi
 
 #change android maven to china repos
diff --git a/Android/APIExample-Compose/cloud_build.sh b/Android/APIExample-Compose/cloud_build.sh
index 428d38341..dcaaddf84 100755
--- a/Android/APIExample-Compose/cloud_build.sh
+++ b/Android/APIExample-Compose/cloud_build.sh
@@ -6,14 +6,31 @@ ls ~/.gradle || (mkdir -p /tmp/.gradle && ln -s /tmp/.gradle ~/.gradle && touch
 ## use open jdk 17
 SYSTEM=$(uname -s)
 if [ "$SYSTEM" = "Linux" ];then
-if [ ! -d "/tmp/jdk-17.0.2" ];then
-  curl -O https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_linux-x64_bin.tar.gz
-  tar zxf openjdk-17.0.2_linux-x64_bin.tar.gz
-  mv jdk-17.0.2 /tmp/
+  if [ ! -d "/tmp/jdk-17.0.2" ];then
+    curl -O https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_linux-x64_bin.tar.gz
+    tar zxf openjdk-17.0.2_linux-x64_bin.tar.gz
+    mv jdk-17.0.2 /tmp/
+  fi
+  export JAVA_HOME=/tmp/jdk-17.0.2
+  export ANDROID_HOME=/usr/lib/android_sdk
+elif [ "$SYSTEM" = "Darwin" ];then
+  export JAVA_HOME=$(/usr/libexec/java_home -v 17)
+  export ANDROID_HOME=${ANDROID_HOME:-$HOME/Library/Android/sdk}
 fi
-export JAVA_HOME=/tmp/jdk-17.0.2
+
 export PATH=$JAVA_HOME/bin:$PATH
-java --version
+java --version || { echo "Error: Failed to get Java version"; exit 1; }
+
+# Configure environment
+if [ "$SYSTEM" = "Linux" ];then
+  [ -f ~/.bashrc ] && source ~/.bashrc
+else
+  # Try to load zsh config first, if not found then try bash_profile
+  if [ -f ~/.zshrc ]; then
+    source ~/.zshrc
+  elif [ -f ~/.bash_profile ]; then
+    source ~/.bash_profile
+  fi
 fi
 
 #change android maven to china repos
diff --git a/Android/APIExample/cloud_build.sh b/Android/APIExample/cloud_build.sh
index 61550d22d..67bc868a0 100755
--- a/Android/APIExample/cloud_build.sh
+++ b/Android/APIExample/cloud_build.sh
@@ -6,14 +6,31 @@ ls ~/.gradle || (mkdir -p /tmp/.gradle && ln -s /tmp/.gradle ~/.gradle && touch
 ## use open jdk 17
 SYSTEM=$(uname -s)
 if [ "$SYSTEM" = "Linux" ];then
-if [ ! -d "/tmp/jdk-17.0.2" ];then
-  curl -O https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_linux-x64_bin.tar.gz
-  tar zxf openjdk-17.0.2_linux-x64_bin.tar.gz
-  mv jdk-17.0.2 /tmp/
+  if [ ! -d "/tmp/jdk-17.0.2" ];then
+    curl -O https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_linux-x64_bin.tar.gz
+    tar zxf openjdk-17.0.2_linux-x64_bin.tar.gz
+    mv jdk-17.0.2 /tmp/
+  fi
+  export JAVA_HOME=/tmp/jdk-17.0.2
+  export ANDROID_HOME=/usr/lib/android_sdk
+elif [ "$SYSTEM" = "Darwin" ];then
+  export JAVA_HOME=$(/usr/libexec/java_home -v 17)
+  export ANDROID_HOME=${ANDROID_HOME:-$HOME/Library/Android/sdk}
 fi
-export JAVA_HOME=/tmp/jdk-17.0.2
+
 export PATH=$JAVA_HOME/bin:$PATH
-java --version
+java --version || { echo "Error: Failed to get Java version"; exit 1; }
+
+# Configure environment
+if [ "$SYSTEM" = "Linux" ];then
+  [ -f ~/.bashrc ] && source ~/.bashrc
+else
+  # Try to load zsh config first, if not found then try bash_profile
+  if [ -f ~/.zshrc ]; then
+    source ~/.zshrc
+  elif [ -f ~/.bash_profile ]; then
+    source ~/.bash_profile
+  fi
 fi
 
 #change android maven to china repos

From 0b4a2f9c99562072a1944ae3dd976d7026c2f1fb Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei03@shengwang.cn>
Date: Thu, 24 Apr 2025 11:46:55 +0800
Subject: [PATCH 05/10] [Android] Update ci.

---
 .github/ci/build/build_android.sh | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.github/ci/build/build_android.sh b/.github/ci/build/build_android.sh
index e540ad070..82447d652 100644
--- a/.github/ci/build/build_android.sh
+++ b/.github/ci/build/build_android.sh
@@ -96,16 +96,10 @@ else
 fi
 
 if [ $compile_project = true ]; then
-	# install android sdk
-	which java
-	java --version
-	source ~/.bashrc
-	export ANDROID_HOME=/usr/lib/android_sdk
-	echo ANDROID_HOME: $ANDROID_HOME
 	cd ./$unzip_name/rtc/samples/API-Example || exit 1
 	if [ -z "$sdk_url" ] || [ "$sdk_url" == "none" ]; then
 		./cloud_build.sh false || exit 1
 	else
 		./cloud_build.sh true || exit 1
 	fi
-fi
\ No newline at end of file
+fi

From 615813cd6ea053601d5284e5eaa27dc97dcc1b26 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei03@shengwang.cn>
Date: Thu, 24 Apr 2025 14:52:58 +0800
Subject: [PATCH 06/10] [Android]Update ci.

---
 .github/ci/build/build_android.sh | 39 ++++++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/.github/ci/build/build_android.sh b/.github/ci/build/build_android.sh
index 82447d652..afa92a8ab 100644
--- a/.github/ci/build/build_android.sh
+++ b/.github/ci/build/build_android.sh
@@ -51,8 +51,10 @@ echo short_version: $short_version
 echo pwd: `pwd`
 echo sdk_url: $sdk_url
 echo compress_apiexample: $compress_apiexample
+
 unzip_name=Agora_Native_SDK_for_Android_FULL_DEFAULT
 zip_name=Agora_Native_SDK_for_Android_FULL_DEFAULT.zip
+
 if [ -z "$sdk_url" ] || [ "$sdk_url" == "none" ]; then
    echo "sdk_url is empty"
    echo unzip_name: $unzip_name 
@@ -79,27 +81,52 @@ fi
 mkdir -p ./$unzip_name/rtc/samples 
 cp -rf ./Android/${android_direction} ./$unzip_name/rtc/samples/API-Example || exit 1
 
+# Define build path variable based on compress_apiexample parameter
+if [ $compress_apiexample = true ]; then
+	build_path="./temp_apiexample"
+	result_file="apiExample_${BUILD_NUMBER}_$zip_name"
+else
+	build_path="./$unzip_name"
+	result_file="withAPIExample_${BUILD_NUMBER}_$zip_name"
+fi
+
 # Decide how to package based on compress_apiexample parameter
-if [ "$compress_apiexample" = "true" ]; then
+if [ $compress_apiexample = true ]; then
 	# Only compress API-Example code
 	echo "Only compressing API-Example code"
 	mkdir -p ./temp_apiexample/rtc/samples
 	cp -rf ./$unzip_name/rtc/samples/API-Example ./temp_apiexample/rtc/samples/ || exit 1
-	7za a -tzip result.zip -r temp_apiexample > log.txt
+	7za a -tzip apiExample_android.zip -r temp_apiexample > log.txt
 	rm -rf ./temp_apiexample
-	mv result.zip $WORKSPACE/apiExample_${BUILD_NUMBER}_$zip_name
+	mv apiExample_android.zip $WORKSPACE/$result_file
 else
 	# Compress the entire SDK including API-Example
 	echo "Compressing the entire SDK including API-Example"
-	7za a -tzip result.zip -r $unzip_name > log.txt
-	mv result.zip $WORKSPACE/withAPIExample_${BUILD_NUMBER}_$zip_name
+	7za a -tzip apiExample_android_with_sdk.zip -r $unzip_name > log.txt
+	mv apiExample_android_with_sdk.zip $WORKSPACE/$result_file
 fi
 
 if [ $compile_project = true ]; then
-	cd ./$unzip_name/rtc/samples/API-Example || exit 1
+	# Based on compress_apiexample, use the appropriate build path
+	if [ $compress_apiexample = true ]; then
+		echo "Building with API-Example only package"
+		mkdir -p ./temp_apiexample/rtc/samples
+		cp -rf ./$unzip_name/rtc/samples/API-Example ./temp_apiexample/rtc/samples/ || exit 1
+		cd ./temp_apiexample/rtc/samples/API-Example || exit 1
+	else
+		echo "Building with full SDK package"
+		cd ./$unzip_name/rtc/samples/API-Example || exit 1
+	fi
+	
 	if [ -z "$sdk_url" ] || [ "$sdk_url" == "none" ]; then
 		./cloud_build.sh false || exit 1
 	else
 		./cloud_build.sh true || exit 1
 	fi
+	
+	# Cleanup temp directory if needed
+	if [ $compress_apiexample = true ]; then
+		cd ../../../../
+		rm -rf ./temp_apiexample
+	fi
 fi

From 925508629049c532dee57690ff14545458cfe075 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei03@shengwang.cn>
Date: Fri, 25 Apr 2025 10:12:13 +0800
Subject: [PATCH 07/10] [Android] ci test.

---
 .github/ci/build/build_android.sh | 60 ++++++-------------------------
 1 file changed, 11 insertions(+), 49 deletions(-)

diff --git a/.github/ci/build/build_android.sh b/.github/ci/build/build_android.sh
index afa92a8ab..2ab650f2e 100644
--- a/.github/ci/build/build_android.sh
+++ b/.github/ci/build/build_android.sh
@@ -17,7 +17,6 @@
 # 'platform: string',
 # 'BUILD_NUMBER: string',
 # 'WORKSPACE: string'
-# 'compress_apiexample:boolean:false'
 #
 # --- Test Related: ---
 #   PR build, zip test related to test.zip
@@ -50,12 +49,9 @@ echo release_version: $release_version
 echo short_version: $short_version
 echo pwd: `pwd`
 echo sdk_url: $sdk_url
-echo compress_apiexample: $compress_apiexample
-
 unzip_name=Agora_Native_SDK_for_Android_FULL_DEFAULT
 zip_name=Agora_Native_SDK_for_Android_FULL_DEFAULT.zip
-
-if [ -z "$sdk_url" ] || [ "$sdk_url" == "none" ]; then
+if [ -z "$sdk_url" ] || [ "$sdk_url" = "none" ]; then
    echo "sdk_url is empty"
    echo unzip_name: $unzip_name 
    echo zip_name: $zip_name
@@ -72,61 +68,27 @@ else
 
 	rm -rf ./$unzip_name/rtc/bin
 	rm -rf ./$unzip_name/rtc/demo
-	rm ./$unzip_name/rtc/commits
-	rm ./$unzip_name/rtc/package_size_report.txt
+	rm ./$unzip_name/commits
+	rm ./$unzip_name/spec
 	rm -rf ./$unzip_name/pom
 fi
-
-# Create API-Example directory and copy files
 mkdir -p ./$unzip_name/rtc/samples 
 cp -rf ./Android/${android_direction} ./$unzip_name/rtc/samples/API-Example || exit 1
+7za a -tzip result.zip -r $unzip_name > log.txt
+mv result.zip $WORKSPACE/withAPIExample_${BUILD_NUMBER}_$zip_name
 
-# Define build path variable based on compress_apiexample parameter
-if [ $compress_apiexample = true ]; then
-	build_path="./temp_apiexample"
-	result_file="apiExample_${BUILD_NUMBER}_$zip_name"
-else
-	build_path="./$unzip_name"
-	result_file="withAPIExample_${BUILD_NUMBER}_$zip_name"
-fi
-
-# Decide how to package based on compress_apiexample parameter
 if [ $compress_apiexample = true ]; then
-	# Only compress API-Example code
-	echo "Only compressing API-Example code"
-	mkdir -p ./temp_apiexample/rtc/samples
-	cp -rf ./$unzip_name/rtc/samples/API-Example ./temp_apiexample/rtc/samples/ || exit 1
-	7za a -tzip apiExample_android.zip -r temp_apiexample > log.txt
-	rm -rf ./temp_apiexample
-	mv apiExample_android.zip $WORKSPACE/$result_file
-else
-	# Compress the entire SDK including API-Example
-	echo "Compressing the entire SDK including API-Example"
-	7za a -tzip apiExample_android_with_sdk.zip -r $unzip_name > log.txt
-	mv apiExample_android_with_sdk.zip $WORKSPACE/$result_file
+	cd ./$unzip_name/rtc/samples/API-Example || exit 1
+	7za a -tzip result_onlyAPIExample.zip -r ./$unzip_name/rtc/samples/API-Example > log1.txt
+	mv result_onlyAPIExample.zip $WORKSPACE/onlyAPIExample_${BUILD_NUMBER}_$zip_name
 fi
 
 if [ $compile_project = true ]; then
-	# Based on compress_apiexample, use the appropriate build path
-	if [ $compress_apiexample = true ]; then
-		echo "Building with API-Example only package"
-		mkdir -p ./temp_apiexample/rtc/samples
-		cp -rf ./$unzip_name/rtc/samples/API-Example ./temp_apiexample/rtc/samples/ || exit 1
-		cd ./temp_apiexample/rtc/samples/API-Example || exit 1
-	else
-		echo "Building with full SDK package"
-		cd ./$unzip_name/rtc/samples/API-Example || exit 1
-	fi
-	
-	if [ -z "$sdk_url" ] || [ "$sdk_url" == "none" ]; then
+	cd ./$unzip_name/rtc/samples/API-Example || exit 1
+	if [ -z "$sdk_url" ] || [ "$sdk_url" = "none" ]; then
 		./cloud_build.sh false || exit 1
 	else
 		./cloud_build.sh true || exit 1
 	fi
-	
-	# Cleanup temp directory if needed
-	if [ $compress_apiexample = true ]; then
-		cd ../../../../
-		rm -rf ./temp_apiexample
-	fi
 fi
+

From 82c068293ef79029f9a9076c14dd4dad9fc86551 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei03@shengwang.cn>
Date: Fri, 25 Apr 2025 11:09:46 +0800
Subject: [PATCH 08/10] [Android] ci.

---
 .github/ci/build/build_android.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/ci/build/build_android.sh b/.github/ci/build/build_android.sh
index 2ab650f2e..224c86586 100644
--- a/.github/ci/build/build_android.sh
+++ b/.github/ci/build/build_android.sh
@@ -37,6 +37,7 @@
 # pr: output test.zip to workspace dir
 # others: Rename the zip package name yourself, But need copy it to workspace dir
 ##################################
+export PATH=$PATH:/opt/homebrew/bin
 
 echo Package_Publish: $Package_Publish
 echo is_tag_fetch: $is_tag_fetch

From bcd7a7c1549503fb6b8dfafefb1900b3a73ce31f Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei03@shengwang.cn>
Date: Fri, 25 Apr 2025 11:23:55 +0800
Subject: [PATCH 09/10] [Android] Update ci.

---
 .github/ci/build/build_android.sh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/ci/build/build_android.sh b/.github/ci/build/build_android.sh
index 224c86586..4f1a0f942 100644
--- a/.github/ci/build/build_android.sh
+++ b/.github/ci/build/build_android.sh
@@ -69,12 +69,20 @@ else
 
 	rm -rf ./$unzip_name/rtc/bin
 	rm -rf ./$unzip_name/rtc/demo
-	rm ./$unzip_name/commits
-	rm ./$unzip_name/spec
+	rm -f ./$unzip_name/.commits
+	rm -f ./$unzip_name/spec
 	rm -rf ./$unzip_name/pom
 fi
-mkdir -p ./$unzip_name/rtc/samples 
-cp -rf ./Android/${android_direction} ./$unzip_name/rtc/samples/API-Example || exit 1
+
+mkdir -p ./$unzip_name/rtc/samples/API-Example || exit 1
+
+if [ -d "./Android/${android_direction}" ]; then
+    cp -rf ./Android/${android_direction}/* ./$unzip_name/rtc/samples/API-Example/ || exit 1
+else
+    echo "Error: Source directory ./Android/${android_direction} does not exist"
+    exit 1
+fi
+
 7za a -tzip result.zip -r $unzip_name > log.txt
 mv result.zip $WORKSPACE/withAPIExample_${BUILD_NUMBER}_$zip_name
 

From 08be537a1cc351f5a0a1e81aa8d60a4cddcc4640 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei03@shengwang.cn>
Date: Fri, 25 Apr 2025 11:37:34 +0800
Subject: [PATCH 10/10] [Android]update ci.

---
 .github/ci/build/build_android.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/ci/build/build_android.sh b/.github/ci/build/build_android.sh
index 4f1a0f942..3722e0045 100644
--- a/.github/ci/build/build_android.sh
+++ b/.github/ci/build/build_android.sh
@@ -87,8 +87,7 @@ fi
 mv result.zip $WORKSPACE/withAPIExample_${BUILD_NUMBER}_$zip_name
 
 if [ $compress_apiexample = true ]; then
-	cd ./$unzip_name/rtc/samples/API-Example || exit 1
-	7za a -tzip result_onlyAPIExample.zip -r ./$unzip_name/rtc/samples/API-Example > log1.txt
+	7za a -tzip result_onlyAPIExample.zip -r ./$unzip_name/rtc/samples/API-Example >> log.txt
 	mv result_onlyAPIExample.zip $WORKSPACE/onlyAPIExample_${BUILD_NUMBER}_$zip_name
 fi