From d1524780dbaa21abb8dfcafddbf82d3f67cc1dde Mon Sep 17 00:00:00 2001
From: cccclai <chenlai907@gmail.com>
Date: Thu, 16 Oct 2025 12:52:09 -0700
Subject: [PATCH] Revert "Don't assign ANDROID_HOME if set already (#15198)"

This reverts commit 04a34fe0fbb692f8fc5a38da826a9ce789c86abd.
---
 scripts/build_android_library.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/build_android_library.sh b/scripts/build_android_library.sh
index 232cc726b5e..a50d15709bd 100755
--- a/scripts/build_android_library.sh
+++ b/scripts/build_android_library.sh
@@ -82,9 +82,9 @@ build_aar() {
     find cmake-out-android-so -type f -name "*.so" -exec "$ANDROID_NDK"/toolchains/llvm/prebuilt/*/bin/llvm-strip {} \;
   fi
   pushd extension/android/
-  ANDROID_HOME="${ANDROID_HOME:-${ANDROID_SDK:-/opt/android/sdk}}"
+  ANDROID_HOME="${ANDROID_SDK:-/opt/android/sdk}" ./gradlew build
   # Use java unit test as sanity check
-  ANDROID_HOME="${ANDROID_HOME:-${ANDROID_SDK:-/opt/android/sdk}}" ./gradlew :executorch_android:testDebugUnitTest
+  ANDROID_HOME="${ANDROID_SDK:-/opt/android/sdk}" ./gradlew :executorch_android:testDebugUnitTest
   popd
   if [ ! -z $BUILD_AAR_DIR ]; then
     cp extension/android/executorch_android/build/outputs/aar/executorch_android-debug.aar "${BUILD_AAR_DIR}/executorch.aar"