[infra/onert] Consolidate Android NDK installation into SDK script

This change simplifies the Android cross-build setup by using a single script for both SDK and NDK installation, and updates to the latest NDK version.
- Remove dedicated install_android_ndk.sh script
- Enhance install_android_sdk.sh to handle NDK installation
- Update NDK version from r26d to r27d
- Update documentation with new installation instructions
- Update Dockerfile to use new NDK version

ONE-DCO-1.0-Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

Author: hseok-oh

docs/howto/how-to-cross-build-runtime-for-android.md

@@ -2,19 +2,39 @@
 
 **Note: To set up a basic build environment on your development PC, please read the [how-to-build-runtime.md](how-to-build-runtime.md) document first. The cross build covered in this document assumes that you have an environment in which the native build operates normally without problems.**
 
-Supported Architecture : AARCH64 only (ARM32 is not supported yet)
+Supported Architecture : AARCH64 only
 
 ## Prepare Android NDK
 
 There are two ways to get Android NDK: install Android NDK on your PC or use docker image which already has Android NDK installed.
 
 ### Install Android NDK
 
-Use `tools/cross/install_android_ndk.sh` script to prepare Android NDK. This is recommended way to build Android NDK.
+You can use `tools/cross/install_android_sdk.sh` script to prepare Android SDK including NDK.
 
-Or you can use `tools/cross/install_android_sdk.sh` script to prepare Android SDK including NDK. You can find NDK in `{android-sdk-dir}/ndk/{ndk-version}` directory.
+```bash
+$ tools/cross/install_android_sdk.sh --install-dir /path/to/android-sdk
+```
+
+If `--install-dir` is not specified, Android SDK will be installed in `tools/cross/android_sdk`.
+
+You can find NDK in `{android-sdk-dir}/ndk/{ndk-version}` directory.
+
+You can check default install NDK version by running `tools/cross/install_android_sdk.sh -h` command.
+
+Installed NDK version can be changed by specifying `--ndk-version` option like below:
+
+```bash
+$ tools/cross/install_android_sdk.sh --ndk-version {ndk-version} --install-dir /path/to/android-sdk
+```
+
+If you want to install NDK version in existing android sdk directory, you can use `--update` option like below:
+
+```bash
+$ tools/cross/install_android_sdk.sh --update --install-dir /path/to/android-sdk
+```
 
-CMake 3.6.0 or later is required for Android NDK r26d CMake support.
+CMake 3.6.0 or later is required for Android NDK r27d CMake support.
 
 ### Host Environment Requirements
 

infra/docker/android-sdk/Dockerfile

@@ -68,7 +68,7 @@ RUN tmp/tools/bin/sdkmanager --sdk_root=${ANDROID_HOME} "cmdline-tools;${CMDTOOL
 RUN rm -rf tmp
 
 # Install android ndk and tools (other packages will be installed by gradle build)
-ARG NDK_VERSION=26.3.11579264
+ARG NDK_VERSION=27.3.13750724
 RUN ${ANDROID_HOME}/cmdline-tools/${CMDTOOLS_VERSION}/bin/sdkmanager --sdk_root=${ANDROID_HOME} "ndk;${NDK_VERSION}"
 RUN ${ANDROID_HOME}/cmdline-tools/${CMDTOOLS_VERSION}/bin/sdkmanager --sdk_root=${ANDROID_HOME} "platform-tools"
 

tools/cross/install_android_ndk.sh

@@ -19,18 +19,21 @@ SCRIPT_HOME=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) # absolute path to
 INSTALL_PATH=$SCRIPT_HOME/android_sdk # path to directory where android sdk will be installed
 PLATFORMS_PACKAGE_VERSION="29" # version of platfroms package which will be installed
 BUILD_TOOLS_PACKAGE_VERSION="29.0.3" # version of build-tools package which will be installed
-NDK_VERSION="26.3.11579264" # version of ndk which will be installed
-COMMAND_LINE_TOOLS_ARCHIVE="commandlinetools-linux-6514223_latest.zip" # command line tools archive name from site https://developer.android.com/studio/#downloads for bootstrap
+NDK_VERSION="27.3.13750724" # version of ndk which will be installed
+COMMAND_LINE_TOOLS_ARCHIVE="commandlinetools-linux-13114758_latest.zip" # command line tools archive name from site https://developer.android.com/studio/#downloads for bootstrap
 COMMAND_LINE_TOOLS_VERSION="10.0" # version of command line tools which will be installed
+UPDATE_TOOLS="0" # update tools flag, if set to 1 then tools will be updated, not new installed
 
 
 usage() {
  printf "usage: ./build_android_sdk.sh [--option [option_value]]\n"
- printf "  --install-dir                 - absolute path to directory where android sdk will be installed, by default: $INSTALL_PATH\n"
+ printf "  --install-dir                 - absolute path to directory where android sdk will be installed or updated, by default: $INSTALL_PATH\n"
+ printf "  --ndk-version                 - version of ndk which will be installed, by default: $NDK_VERSION\n"
  printf "  --platforms-package-version   - version of platforms package which will be installed, by default: $PLATFORMS_PACKAGE_VERSION\n"
  printf "  --build-tools-package-version - version of build-tools package which will be installed, by default: $BUILD_TOOLS_PACKAGE_VERSION\n"
  printf "  --command-line-tools-version  - version of cmdline-tools package which will be installed, by default: $COMMAND_LINE_TOOLS_VERSION\n"
  printf "  --command-line-tools-archive  - name of command line tools archive from site https://developer.android.com/studio/#downloads, by default: $COMMAND_LINE_TOOLS_ARCHIVE\n"
+ printf "  --update                      - update android sdk, not new install \n"
  printf "  --help                        - show this text\n"
 }
 
@@ -61,8 +64,10 @@ check_that_android_sdk_have_not_been_installed_yet() {
 
 make_environment() {
   local root=${1}
-  check_that_android_sdk_have_not_been_installed_yet $root
-  mkdir -p $root
+  if [ $UPDATE_TOOLS == "0" ]; then
+    check_that_android_sdk_have_not_been_installed_yet $root
+    mkdir -p $root
+  fi
 
   pushd $root > /dev/null
   export ANDROID_HOME=$root
@@ -160,6 +165,10 @@ while [[ $# -gt 0 ]]; do
       COMMAND_LINE_TOOLS_ARCHIVE=${1}
       shift
       ;;
+    --update)
+      UPDATE_TOOLS="1"
+      shift
+      ;;
     *)
       echo "Invalid option '$1'"
       usage
@@ -170,6 +179,8 @@ done
 
 check_preconditions
 make_environment $INSTALL_PATH
-install_command_line_tools $INSTALL_PATH
+if [ $UPDATE_TOOLS == "0" ]; then
+  install_command_line_tools $INSTALL_PATH
+fi
 install_android_ndk $INSTALL_PATH
 install_android_sdk $INSTALL_PATH