sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2024-10-05 18:30:50 +01:00
Code Issues Releases Wiki Activity

tools/android: Make install_base.sh modular for LISA integration

Browse Source 
Both devlib and LISA utilizes install_base.sh script, but they install
different packages and support different input arguments. Also support
custom ANDROID_HOME environment variable in order to let LISA (or just
let users install Android SDK/tools wherever they want) choose install
location.

Signed-off-by: Metin Kaya <metin.kaya@arm.com>
This commit is contained in:
Metin Kaya 2024-05-29 10:50:30 +01:00 committed by Marc Bonnici
parent d8a09e895c
commit b485484850
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tools/android/install_base.sh
View File

@ -21,8 +21,10 @@
# shellcheck disable=SC2317
ANDROID_HOME="$(dirname "${BASH_SOURCE[0]}")/android-sdk-linux"
export ANDROID_HOME
if [[ -z ${ANDROID_HOME:-} ]]; then
ANDROID_HOME="$(dirname "${BASH_SOURCE[0]}")/android-sdk-linux"
export ANDROID_HOME
fi
export ANDROID_USER_HOME="${ANDROID_HOME}/.android"
ANDROID_CMDLINE_VERSION=${ANDROID_CMDLINE_VERSION:-"11076708"}
@ -122,15 +124,24 @@ call_android_avdmanager() {
call_android_sdk avdmanager "$@"
}
# Needs install_android_sdk_manager first
install_android_tools() {
local android_sdk_host_arch
android_sdk_host_arch=$(get_android_sdk_host_arch)
install_build_tools() {
yes | call_android_sdkmanager --verbose --channel=0 --install "build-tools;34.0.0"
}
install_platform_tools() {
yes | call_android_sdkmanager --verbose --channel=0 --install "platform-tools"
}
install_platforms() {
yes | call_android_sdkmanager --verbose --channel=0 --install "platforms;android-31"
yes | call_android_sdkmanager --verbose --channel=0 --install "platforms;android-33"
yes | call_android_sdkmanager --verbose --channel=0 --install "platforms;android-34"
}
install_system_images() {
local android_sdk_host_arch
android_sdk_host_arch=$(get_android_sdk_host_arch)
yes | call_android_sdkmanager --verbose --channel=0 --install "system-images;android-31;google_apis;${android_sdk_host_arch}"
yes | call_android_sdkmanager --verbose --channel=0 --install "system-images;android-33;android-desktop;${android_sdk_host_arch}"
yes | call_android_sdkmanager --verbose --channel=0 --install "system-images;android-34;google_apis;${android_sdk_host_arch}"
@ -258,7 +269,8 @@ for arg in "${args[@]}"; do
install_functions+=(
find_java_home
install_android_sdk_manager
install_android_tools
install_build_tools
install_platform_tools
)
apt_packages+=(openjdk-"${ANDROID_SDK_JAVA_VERSION}"-jre openjdk-"${ANDROID_SDK_JAVA_VERSION}"-jdk)
pacman_packages+=(jre"${ANDROID_SDK_JAVA_VERSION}"-openjdk jdk"${ANDROID_SDK_JAVA_VERSION}"-openjdk)
@ -269,7 +281,9 @@ for arg in "${args[@]}"; do
install_functions+=(
find_java_home
install_android_sdk_manager
install_android_tools
install_platform_tools
install_platforms
install_system_images
create_android_vds
)
handled=1
@ -301,7 +315,11 @@ ordered_functions=(
# cleanup must be done BEFORE installing
cleanup_android_home
install_android_sdk_manager
install_android_tools
install_android_platform_tools
install_build_tools
install_platform_tools
install_platforms
install_system_images
create_android_vds
)