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/setup_host.sh: Rename install_base.sh to setup_host.sh

Browse Source 
install_base.sh is left-over from LISA/install_base.sh. Scope of the
script in question is different (and potentially can diverge more) than
its root in LISA. Hence, give it a more descriptive (hopefully) name.

Signed-off-by: Metin Kaya <metin.kaya@arm.com>
This commit is contained in:
Metin Kaya 2024-06-19 14:08:25 +01:00 committed by Marc Bonnici
parent b485484850
commit b7d7b46626
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/tools.rst
View File

@ -4,7 +4,7 @@ Tools
Android Android
------- -------
``tools/android/install_base.sh`` script installs Android command line tools ``tools/android/setup_host.sh`` script installs Android command line tools
for Linux and creates Android Virtual Devices (AVD). for Linux and creates Android Virtual Devices (AVD).
The script creates ``android-sdk-linux`` directory under ``tools/android`` and The script creates ``android-sdk-linux`` directory under ``tools/android`` and
@ -13,7 +13,7 @@ https://developer.android.com/tools/variables).
Your ``ANDROID_USER_HOME`` and ``ANDROID_EMULATOR_HOME`` environment variables Your ``ANDROID_USER_HOME`` and ``ANDROID_EMULATOR_HOME`` environment variables
point to ``tools/android/android-sdk-linux/.android``. Hence, removing point to ``tools/android/android-sdk-linux/.android``. Hence, removing
``android-sdk-linux`` folder will clean all artefacts of ``install_base.sh``. ``android-sdk-linux`` folder will clean all artefacts of ``setup_host.sh``.
It fetches Android command line tools, then installs Android SDK It fetches Android command line tools, then installs Android SDK
Platform-Tools, SDK Platform 31 (for Android 12) & 34 (for Android 14), and Platform-Tools, SDK Platform 31 (for Android 12) & 34 (for Android 14), and
@ -93,7 +93,7 @@ tests for Android, Linux, LocalLinux, and QEMU targets.
The Dockerfile forks from ``Ubuntu-22.04``, installs required system packages, The Dockerfile forks from ``Ubuntu-22.04``, installs required system packages,
checks out ``master`` branch of devlib, installs devlib, creates Android checks out ``master`` branch of devlib, installs devlib, creates Android
virtual devices via ``tools/android/install_base.sh``, and QEMU images for virtual devices via ``tools/android/setup_host.sh``, and QEMU images for
aarch64 and x86_84 architectures. aarch64 and x86_84 architectures.
Version Android command line tools (``CMDLINE_VERSION``), buildroot Version Android command line tools (``CMDLINE_VERSION``), buildroot

2
tools/android/install_base.sh → tools/android/setup_host.sh
View File

@ -17,7 +17,7 @@
# limitations under the License. # limitations under the License.
# Script to install Android SDK tools for LISA & devlib on an Ubuntu-like # Script to install Android SDK tools for LISA & devlib on an Ubuntu-like
# system. # system and creates Android virtual devices.
# shellcheck disable=SC2317 # shellcheck disable=SC2317

2
tools/docker/Dockerfile
View File

@ -66,7 +66,7 @@ RUN cd /devlib && \
# Set ANDROID_CMDLINE_VERSION environment variable if you want to use a # Set ANDROID_CMDLINE_VERSION environment variable if you want to use a
# specific version of Android command line tools rather than default # specific version of Android command line tools rather than default
# which is ``11076708`` as of writing this comment. # which is ``11076708`` as of writing this comment.
RUN cd /devlib/tools/android && ./install_base.sh RUN cd /devlib/tools/android && ./setup_host.sh
# Set BUILDROOT_VERSION environment variable if you want to use a specific # Set BUILDROOT_VERSION environment variable if you want to use a specific
# branch of buildroot rather than default which is ``2023.11.1`` as of # branch of buildroot rather than default which is ``2023.11.1`` as of