(Android) Moved some defines into one place

Change-Id: I1ef96d8c80fa39bb628438c852af530f781e47ac

diff --git a/build/android/dali/build.sh b/build/android/dali/build.sh
index 62969f4c7255c9424f1a1a506f2348092b1c3344..56c9bed211102d93278a40ea96fa43b123ee1eec 100755 (executable)
--- a/build/android/dali/build.sh
+++ b/build/android/dali/build.sh
@@ -26,8 +26,11 @@ if [ ! -z "$DEBUG" ]; then
   export ENABLE_TRACE=ON
 fi
 
-ANDROID_PLATFORM=26 ANDROID_ABI=${TARGET} ./build_core.sh || exit 1
-ANDROID_PLATFORM=26 ANDROID_ABI=${TARGET} ./build_adaptor.sh || exit 1
-ANDROID_PLATFORM=26 ANDROID_ABI=${TARGET} ./build_toolkit.sh || exit 1
-ANDROID_PLATFORM=26 ANDROID_ABI=${TARGET} ./build_demo.sh || exit 1
+export ANDROID_CMAKE_COMMAND=${ANDROID_SDK}/cmake/3.22.1/bin/cmake
+export ANDROID_PLATFORM=26
+export ANDROID_ABI=${TARGET}
 
+./build_core.sh || exit 1
+./build_adaptor.sh || exit 1
+./build_toolkit.sh || exit 1
+./build_demo.sh || exit 1

diff --git a/build/android/dali/build_adaptor.sh b/build/android/dali/build_adaptor.sh
index 96bdda4825944fcc1934e5cf07ed53f503de723e..b3668a789e51ebba41a8dc85c2c34310e6815e79 100755 (executable)
--- a/build/android/dali/build_adaptor.sh
+++ b/build/android/dali/build_adaptor.sh
@@ -19,9 +19,24 @@ else
   export PKG_CONFIG_PATH=${PREFIX}/lib/${ANDROID_ABI}/pkgconfig
   export DALI_DATA_RO_DIR=assets
   export DALI_DATA_RW_DIR=/data/data/com.sec.dali_demo/files
-  ${ANDROID_SDK}/cmake/3.22.1/bin/cmake -S ${DALI_DIR}/dali-adaptor/build/tizen -DCMAKE_C_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -DCMAKE_CXX_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=${ANDROID_PLATFORM} -DANDROID_ABI=${ANDROID_ABI} -DANDROID_NDK=${ANDROID_NDK} -DANDROID_STL=c++_shared -DCMAKE_CXX_FLAGS='-fexceptions -frtti -w -Wall -std=c++17' -DINCLUDE_DIR=${PREFIX}/include -DLIB_DIR=${PREFIX}/lib/${ANDROID_ABI} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DENABLE_TRACE=${ENABLE_TRACE} -DENABLE_PROFILE=ANDROID
+  # There are other exports in the calling build.sh script
+
+  ${ANDROID_CMAKE_COMMAND} -S ${DALI_DIR}/dali-adaptor/build/tizen \
+    -DCMAKE_C_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang \
+    -DCMAKE_CXX_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ \
+    -DCMAKE_INSTALL_PREFIX=${PREFIX} \
+    -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake \
+    -DANDROID_PLATFORM=${ANDROID_PLATFORM} \
+    -DANDROID_ABI=${ANDROID_ABI} \
+    -DANDROID_NDK=${ANDROID_NDK} \
+    -DANDROID_STL=c++_shared \
+    -DCMAKE_CXX_FLAGS='-fexceptions -frtti -w -Wall -std=c++17' \
+    -DINCLUDE_DIR=${PREFIX}/include \
+    -DLIB_DIR=${PREFIX}/lib/${ANDROID_ABI} \
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
+    -DENABLE_TRACE=${ENABLE_TRACE} \
+    -DENABLE_PROFILE=ANDROID
 fi
 
-make -j8 || exit 1
-make install || exit 1
+make -j8 install || exit 1
 cd -

diff --git a/build/android/dali/build_core.sh b/build/android/dali/build_core.sh
index 9c35211101053737e157d1730922a4aaea77692a..91dafc1a65d75045d1a381fcf3843d3c86140b24 100755 (executable)
--- a/build/android/dali/build_core.sh
+++ b/build/android/dali/build_core.sh
@@ -18,10 +18,23 @@ else
   export PREFIX=${DALI_ENV_DIR}
   export PKG_CONFIG_LIBDIR=${ANDROID_NDK}/prebuilt/linux-x86_64/lib/pkgconfig
   export PKG_CONFIG_PATH=${PREFIX}/lib/${ANDROID_ABI}/pkgconfig
-  ${ANDROID_SDK}/cmake/3.22.1/bin/cmake -S ${DALI_DIR}/dali-core/build/tizen -DCMAKE_C_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -DCMAKE_CXX_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=${ANDROID_PLATFORM} -DANDROID_ABI=${ANDROID_ABI} -DANDROID_NDK=${ANDROID_NDK} -DANDROID_STL=c++_shared -DCMAKE_CXX_FLAGS='-fexceptions -frtti -w -Wall -std=c++17' -DINCLUDE_DIR=${PREFIX}/include -DLIB_DIR=${PREFIX}/lib/${ANDROID_ABI} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DENABLE_TRACE=${ENABLE_TRACE}
-fi
+  # There are other exports in the calling build.sh script
 
-make -j8 || exit 1
-make install || exit 1
+  ${ANDROID_CMAKE_COMMAND} -S ${DALI_DIR}/dali-core/build/tizen \
+    -DCMAKE_C_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang \
+    -DCMAKE_CXX_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ \
+    -DCMAKE_INSTALL_PREFIX=${PREFIX} \
+    -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake \
+    -DANDROID_PLATFORM=${ANDROID_PLATFORM} \
+    -DANDROID_ABI=${ANDROID_ABI} \
+    -DANDROID_NDK=${ANDROID_NDK} \
+    -DANDROID_STL=c++_shared \
+    -DCMAKE_CXX_FLAGS='-fexceptions -frtti -w -Wall -std=c++17' \
+    -DINCLUDE_DIR=${PREFIX}/include \
+    -DLIB_DIR=${PREFIX}/lib/${ANDROID_ABI} \
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
+    -DENABLE_TRACE=${ENABLE_TRACE}
+fi
 
+make -j8 install || exit 1
 cd -

diff --git a/build/android/dali/build_demo.sh b/build/android/dali/build_demo.sh
index 1aa789d5455f03a53b26a71105b56dd4872f530e..e4f5588a3c41542985ece3df7a4d2f25d719619a 100755 (executable)
--- a/build/android/dali/build_demo.sh
+++ b/build/android/dali/build_demo.sh
@@ -23,11 +23,29 @@ else
   export DALI_DEMO_RES_DIR=assets
   #NOTE: keep app id consistent with dali-demo/build/android/app/src/main/AndroidManifest.xml
   export DALI_DEMO_APP_ID=com.sec.dalidemo
+  # There are other exports in the calling build.sh script
 
-  ${ANDROID_SDK}/cmake/3.22.1/bin/cmake -S ${DALI_DIR}/dali-demo/build/tizen -DCMAKE_C_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -DCMAKE_CXX_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=${ANDROID_PLATFORM} -DANDROID_ABI=${ANDROID_ABI} -DANDROID_NDK=${ANDROID_NDK} -DANDROID_STL=c++_shared -DCMAKE_CXX_FLAGS='-fexceptions -frtti -w -Wall -std=c++17' -DINCLUDE_DIR=${PREFIX}/include -DLIB_DIR=${PREFIX}/lib/${ANDROID_ABI} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DENABLE_TRACE=${ENABLE_TRACE} -DINTERNATIONALIZATION=OFF -DSHARED=ON -DDALI_APP_RES_DIR=${DALI_APP_RES_DIR} -DDALI_APP_DIR=${DALI_APP_DIR} -DDALI_DEMO_RES_DIR=${DALI_DEMO_RES_DIR} -DDALI_DEMO_APP_ID=${DALI_DEMO_APP_ID}
+  ${ANDROID_CMAKE_COMMAND} -S ${DALI_DIR}/dali-demo/build/tizen \
+    -DCMAKE_C_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang \
+    -DCMAKE_CXX_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ \
+    -DCMAKE_INSTALL_PREFIX=${PREFIX} \
+    -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake \
+    -DANDROID_PLATFORM=${ANDROID_PLATFORM} \
+    -DANDROID_ABI=${ANDROID_ABI} \
+    -DANDROID_NDK=${ANDROID_NDK} \
+    -DANDROID_STL=c++_shared \
+    -DCMAKE_CXX_FLAGS='-fexceptions -frtti -w -Wall -std=c++17' \
+    -DINCLUDE_DIR=${PREFIX}/include \
+    -DLIB_DIR=${PREFIX}/lib/${ANDROID_ABI} \
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
+    -DENABLE_TRACE=${ENABLE_TRACE} \
+    -DINTERNATIONALIZATION=OFF \
+    -DSHARED=ON \
+    -DDALI_APP_RES_DIR=${DALI_APP_RES_DIR} \
+    -DDALI_APP_DIR=${DALI_APP_DIR} \
+    -DDALI_DEMO_RES_DIR=${DALI_DEMO_RES_DIR} \
+    -DDALI_DEMO_APP_ID=${DALI_DEMO_APP_ID}
 fi
 
-make -j8 || exit 1
-make install || exit 1
-
+make -j8 install || exit 1
 cd -

diff --git a/build/android/dali/build_toolkit.sh b/build/android/dali/build_toolkit.sh
index 2140e6be731cd9f84ab9893e8886900cbf38e422..215787b2242c6ca924568b01f4d52924f800f2d1 100755 (executable)
--- a/build/android/dali/build_toolkit.sh
+++ b/build/android/dali/build_toolkit.sh
@@ -26,12 +26,26 @@ else
   export DALI_DATA_RW_DIR=/data/data/com.sec.dali_demo/files
   export DALI_DATA_RO_INSTALL_DIR=${PREFIX}/files
   export DALI_DATA_RW_INSTALL_DIR=${PREFIX}/files
-
-  ${ANDROID_SDK}/cmake/3.22.1/bin/cmake -S ${DALI_DIR}/dali-toolkit/build/tizen -DCMAKE_C_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -DCMAKE_CXX_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=${ANDROID_PLATFORM} -DANDROID_ABI=${ANDROID_ABI} -DANDROID_NDK=${ANDROID_NDK} -DANDROID_STL=c++_shared -DCMAKE_CXX_FLAGS='-fexceptions -frtti -w -Wall -std=c++17' -DINCLUDE_DIR=${PREFIX}/include -DLIB_DIR=${PREFIX}/lib/${ANDROID_ABI} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DENABLE_TRACE=${ENABLE_TRACE} -DWITH_STYLE='2048x1080' -DANDROID_HOST_COMPILER="$CXX"
+  # There are other exports in the calling build.sh script
+
+  ${ANDROID_CMAKE_COMMAND} -S ${DALI_DIR}/dali-toolkit/build/tizen \
+    -DCMAKE_C_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang \
+    -DCMAKE_CXX_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ \
+    -DCMAKE_INSTALL_PREFIX=${PREFIX} \
+    -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake \
+    -DANDROID_PLATFORM=${ANDROID_PLATFORM} \
+    -DANDROID_ABI=${ANDROID_ABI} \
+    -DANDROID_NDK=${ANDROID_NDK} \
+    -DANDROID_STL=c++_shared \
+    -DCMAKE_CXX_FLAGS='-fexceptions -frtti -w -Wall -std=c++17' \
+    -DINCLUDE_DIR=${PREFIX}/include \
+    -DLIB_DIR=${PREFIX}/lib/${ANDROID_ABI} \
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
+    -DENABLE_TRACE=${ENABLE_TRACE} \
+    -DWITH_STYLE='2048x1080' \
+    -DANDROID_HOST_COMPILER="$CXX"
 fi
 
-make -j8 || exit 1
-make install || exit 1
-cp -R ${DALI_DIR}/dali-toolkit/automated-tests/resources/fonts/* ${DALI_DIR}/dali-env/android/files/fonts
-
+make -j8 install || exit 1
+cp -R ${DALI_DIR}/dali-toolkit/automated-tests/resources/fonts/* ${DALI_ENV_DIR}/files/fonts
 cd -

diff --git a/build/android/dali/env.sh b/build/android/dali/env.sh
index 09f05393c22a73dd28ac16e14b4a65de033e3c0a..5fafbfb7729e96825dfade8ffb9e47b0ec7c7518 100755 (executable)
--- a/build/android/dali/env.sh
+++ b/build/android/dali/env.sh
@@ -1,17 +1,17 @@
 if [ ! -d "$ANDROID_SDK" ]; then
-# try default path
-if [ -d "$HOME/Android/Sdk" ]; then
-export ANDROID_SDK=$HOME/Android/Sdk
-fi
+  # try default path
+  if [ -d "$HOME/Android/Sdk" ]; then
+    export ANDROID_SDK=$HOME/Android/Sdk
+  fi
 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//')
-if [ -d "$NDK_DIR" ]; then
-export ANDROID_NDK=$NDK_DIR
-fi
-fi
+  if [ -d $ANDROID_SDK ]; then
+    NDK_DIR=$(find $ANDROID_SDK -maxdepth 2 -name ndk-build | sed 's/\/ndk-build//')
+    if [ -d "$NDK_DIR" ]; then
+      export ANDROID_NDK=$NDK_DIR
+    fi
+  fi
 fi
 
 if [ ! -d "$DALI_DIR" ]; then