Skip to content

Commit

Permalink
[build] Fix #18008 - Only build Android when ANDROID_HOME set. (#18014)
Browse files Browse the repository at this point in the history
  • Loading branch information
turon authored and pull[bot] committed Jun 23, 2023
1 parent e3b09b4 commit 2209602
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions gn_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,13 @@ for arg; do
user_args+=" $arg"
done

# Android prebuilt JAR setup
python3 third_party/android_deps/set_up_android_deps.py

# Android SDK setup
android_sdk_args=""

if [[ -d "${ANDROID_NDK_HOME}/toolchains" && -d "${ANDROID_HOME}/platforms" ]]; then
# Android prebuilt JAR setup
python3 third_party/android_deps/set_up_android_deps.py

android_sdk_args+="android_sdk_root=\"$ANDROID_HOME\" android_ndk_root=\"$ANDROID_NDK_HOME\""
extra_args+=" $android_sdk_args enable_android_builds=true"
else
Expand Down

0 comments on commit 2209602

Please sign in to comment.