From a0a7f80f6dfbcdcfcf21a2b99235602ab53d7fc7 Mon Sep 17 00:00:00 2001
From: cccclai <chenlai@meta.com>
Date: Thu, 16 Oct 2025 11:24:13 -0700
Subject: [PATCH] Don't assign ANDROID_HOME if set already

In the guidance we ask users to set $ANDROID_HOME, but we don't respect it when building aar https://github.com/pytorch/executorch/blob/4bf7e12cce28c2a9695bb34a0028f3cf25c9b829/docs/source/using-executorch-android.md
---
 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 a50d15709bd..232cc726b5e 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_SDK:-/opt/android/sdk}" ./gradlew build
+  ANDROID_HOME="${ANDROID_HOME:-${ANDROID_SDK:-/opt/android/sdk}}"
   # Use java unit test as sanity check
-  ANDROID_HOME="${ANDROID_SDK:-/opt/android/sdk}" ./gradlew :executorch_android:testDebugUnitTest
+  ANDROID_HOME="${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"