Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-demo.git] / build / android / build.sh

diff --git a/build/android/build.sh b/build/android/build.sh
index 6e0bf9f..7d2b9c0 100755 (executable)
--- a/build/android/build.sh
+++ b/build/android/build.sh
@@ -25,10 +25,10 @@ if [ ! -d "$ANDROID_SDK" ]; then
   if [ ! -d "$ROOT_DIR/Android/Sdk" ]; then
     mkdir -p "$ROOT_DIR/Android/Sdk"
     cd "$ROOT_DIR/Android/Sdk"
-    wget https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip
-    unzip sdk-tools-linux-4333796.zip
+    wget --quiet https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip
+    unzip -q sdk-tools-linux-4333796.zip
     tools/bin/sdkmanager --update $SdbProxyOptions
-    yes | tools/bin/sdkmanager $SdbProxyOptions "patcher;v4" "platform-tools" "platforms;android-29" "build-tools;29.0.2" "lldb;3.1" "cmake;3.10.2.4988404" "ndk-bundle" "ndk;20.1.5948944"
+    yes | tools/bin/sdkmanager $SdbProxyOptions "patcher;v4" "platform-tools" "platforms;android-29" "build-tools;29.0.2" "cmake;3.10.2.4988404" "ndk-bundle" "ndk;22.1.7171670"
     cd -
   fi
 fi
@@ -43,6 +43,10 @@ fi
 if [ ! -d "$ANDROID_NDK" ]; then
   if [ -d "$ANDROID_SDK" ]; then
     NDK_DIR=$(find $ANDROID_SDK -maxdepth 2 -name ndk-build | sed 's/\/ndk-build//')
+    # Some sdk folder structures have extra <version> dir for ndk folders.
+    if [ ! -d "$NDK_DIR" ]; then
+      NDK_DIR=$(find $ANDROID_SDK -maxdepth 3 -name ndk-build | sed 's/\/ndk-build//')
+    fi
     if [ -d "$NDK_DIR" ]; then
       export ANDROID_NDK=$NDK_DIR
     fi
@@ -52,8 +56,8 @@ fi
 if [ ! -d "$ROOT_DIR/gradle/gradle-5.4.1" ]; then
   mkdir -p $ROOT_DIR/gradle
   cd $ROOT_DIR/gradle
-  wget https://services.gradle.org/distributions/gradle-5.4.1-bin.zip
-  unzip gradle-5.4.1-bin.zip
+  wget --quiet https://services.gradle.org/distributions/gradle-5.4.1-bin.zip
+  unzip -q gradle-5.4.1-bin.zip
   cd -
 fi