Peter M. Groen / dali-demo

Commit c5baff1296e5e5bd6d7393166f901fcf39922bc5

Authored by Adeel Kazmi
1 parent 14e75524

(Android) Moved some defines into one place 

Change-Id: I1ef96d8c80fa39bb628438c852af530f781e47ac
Inline Side-by-side
Showing 6 changed files with 94 additions and 31 deletions
build/android/dali/build.sh
  View file @c5baff1
@@ -26,8 +26,11 @@ if [ ! -z "$DEBUG" ]; then @@ -26,8 +26,11 @@ if [ ! -z "$DEBUG" ]; then
26 export ENABLE_TRACE=ON 26 export ENABLE_TRACE=ON
27 fi 27 fi
28 28
29 -ANDROID_PLATFORM=26 ANDROID_ABI=${TARGET} ./build_core.sh || exit 1  
30 -ANDROID_PLATFORM=26 ANDROID_ABI=${TARGET} ./build_adaptor.sh || exit 1  
31 -ANDROID_PLATFORM=26 ANDROID_ABI=${TARGET} ./build_toolkit.sh || exit 1  
32 -ANDROID_PLATFORM=26 ANDROID_ABI=${TARGET} ./build_demo.sh || exit 1 29 +export ANDROID_CMAKE_COMMAND=${ANDROID_SDK}/cmake/3.22.1/bin/cmake
  30 +export ANDROID_PLATFORM=26
  31 +export ANDROID_ABI=${TARGET}
33 32
  33 +./build_core.sh || exit 1
  34 +./build_adaptor.sh || exit 1
  35 +./build_toolkit.sh || exit 1
  36 +./build_demo.sh || exit 1
build/android/dali/build_adaptor.sh
  View file @c5baff1
@@ -19,9 +19,24 @@ else @@ -19,9 +19,24 @@ else
19 export PKG_CONFIG_PATH=${PREFIX}/lib/${ANDROID_ABI}/pkgconfig 19 export PKG_CONFIG_PATH=${PREFIX}/lib/${ANDROID_ABI}/pkgconfig
20 export DALI_DATA_RO_DIR=assets 20 export DALI_DATA_RO_DIR=assets
21 export DALI_DATA_RW_DIR=/data/data/com.sec.dali_demo/files 21 export DALI_DATA_RW_DIR=/data/data/com.sec.dali_demo/files
22 - ${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 22 + # There are other exports in the calling build.sh script
  23 +
  24 + ${ANDROID_CMAKE_COMMAND} -S ${DALI_DIR}/dali-adaptor/build/tizen \
  25 + -DCMAKE_C_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang \
  26 + -DCMAKE_CXX_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ \
  27 + -DCMAKE_INSTALL_PREFIX=${PREFIX} \
  28 + -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake \
  29 + -DANDROID_PLATFORM=${ANDROID_PLATFORM} \
  30 + -DANDROID_ABI=${ANDROID_ABI} \
  31 + -DANDROID_NDK=${ANDROID_NDK} \
  32 + -DANDROID_STL=c++_shared \
  33 + -DCMAKE_CXX_FLAGS='-fexceptions -frtti -w -Wall -std=c++17' \
  34 + -DINCLUDE_DIR=${PREFIX}/include \
  35 + -DLIB_DIR=${PREFIX}/lib/${ANDROID_ABI} \
  36 + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
  37 + -DENABLE_TRACE=${ENABLE_TRACE} \
  38 + -DENABLE_PROFILE=ANDROID
23 fi 39 fi
24 40
25 -make -j8 || exit 1  
26 -make install || exit 1 41 +make -j8 install || exit 1
27 cd - 42 cd -
build/android/dali/build_core.sh
  View file @c5baff1
@@ -18,10 +18,23 @@ else @@ -18,10 +18,23 @@ else
18 export PREFIX=${DALI_ENV_DIR} 18 export PREFIX=${DALI_ENV_DIR}
19 export PKG_CONFIG_LIBDIR=${ANDROID_NDK}/prebuilt/linux-x86_64/lib/pkgconfig 19 export PKG_CONFIG_LIBDIR=${ANDROID_NDK}/prebuilt/linux-x86_64/lib/pkgconfig
20 export PKG_CONFIG_PATH=${PREFIX}/lib/${ANDROID_ABI}/pkgconfig 20 export PKG_CONFIG_PATH=${PREFIX}/lib/${ANDROID_ABI}/pkgconfig
21 - ${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}  
22 -fi 21 + # There are other exports in the calling build.sh script
23 22
24 -make -j8 || exit 1  
25 -make install || exit 1 23 + ${ANDROID_CMAKE_COMMAND} -S ${DALI_DIR}/dali-core/build/tizen \
  24 + -DCMAKE_C_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang \
  25 + -DCMAKE_CXX_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ \
  26 + -DCMAKE_INSTALL_PREFIX=${PREFIX} \
  27 + -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake \
  28 + -DANDROID_PLATFORM=${ANDROID_PLATFORM} \
  29 + -DANDROID_ABI=${ANDROID_ABI} \
  30 + -DANDROID_NDK=${ANDROID_NDK} \
  31 + -DANDROID_STL=c++_shared \
  32 + -DCMAKE_CXX_FLAGS='-fexceptions -frtti -w -Wall -std=c++17' \
  33 + -DINCLUDE_DIR=${PREFIX}/include \
  34 + -DLIB_DIR=${PREFIX}/lib/${ANDROID_ABI} \
  35 + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
  36 + -DENABLE_TRACE=${ENABLE_TRACE}
  37 +fi
26 38
  39 +make -j8 install || exit 1
27 cd - 40 cd -
build/android/dali/build_demo.sh
  View file @c5baff1
@@ -23,11 +23,29 @@ else @@ -23,11 +23,29 @@ else
23 export DALI_DEMO_RES_DIR=assets 23 export DALI_DEMO_RES_DIR=assets
24 #NOTE: keep app id consistent with dali-demo/build/android/app/src/main/AndroidManifest.xml 24 #NOTE: keep app id consistent with dali-demo/build/android/app/src/main/AndroidManifest.xml
25 export DALI_DEMO_APP_ID=com.sec.dalidemo 25 export DALI_DEMO_APP_ID=com.sec.dalidemo
  26 + # There are other exports in the calling build.sh script
26 27
27 - ${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} 28 + ${ANDROID_CMAKE_COMMAND} -S ${DALI_DIR}/dali-demo/build/tizen \
  29 + -DCMAKE_C_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang \
  30 + -DCMAKE_CXX_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ \
  31 + -DCMAKE_INSTALL_PREFIX=${PREFIX} \
  32 + -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake \
  33 + -DANDROID_PLATFORM=${ANDROID_PLATFORM} \
  34 + -DANDROID_ABI=${ANDROID_ABI} \
  35 + -DANDROID_NDK=${ANDROID_NDK} \
  36 + -DANDROID_STL=c++_shared \
  37 + -DCMAKE_CXX_FLAGS='-fexceptions -frtti -w -Wall -std=c++17' \
  38 + -DINCLUDE_DIR=${PREFIX}/include \
  39 + -DLIB_DIR=${PREFIX}/lib/${ANDROID_ABI} \
  40 + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
  41 + -DENABLE_TRACE=${ENABLE_TRACE} \
  42 + -DINTERNATIONALIZATION=OFF \
  43 + -DSHARED=ON \
  44 + -DDALI_APP_RES_DIR=${DALI_APP_RES_DIR} \
  45 + -DDALI_APP_DIR=${DALI_APP_DIR} \
  46 + -DDALI_DEMO_RES_DIR=${DALI_DEMO_RES_DIR} \
  47 + -DDALI_DEMO_APP_ID=${DALI_DEMO_APP_ID}
28 fi 48 fi
29 49
30 -make -j8 || exit 1  
31 -make install || exit 1  
32 - 50 +make -j8 install || exit 1
33 cd - 51 cd -
build/android/dali/build_toolkit.sh
  View file @c5baff1
@@ -26,12 +26,26 @@ else @@ -26,12 +26,26 @@ else
26 export DALI_DATA_RW_DIR=/data/data/com.sec.dali_demo/files 26 export DALI_DATA_RW_DIR=/data/data/com.sec.dali_demo/files
27 export DALI_DATA_RO_INSTALL_DIR=${PREFIX}/files 27 export DALI_DATA_RO_INSTALL_DIR=${PREFIX}/files
28 export DALI_DATA_RW_INSTALL_DIR=${PREFIX}/files 28 export DALI_DATA_RW_INSTALL_DIR=${PREFIX}/files
29 -  
30 - ${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" 29 + # There are other exports in the calling build.sh script
  30 +
  31 + ${ANDROID_CMAKE_COMMAND} -S ${DALI_DIR}/dali-toolkit/build/tizen \
  32 + -DCMAKE_C_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang \
  33 + -DCMAKE_CXX_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ \
  34 + -DCMAKE_INSTALL_PREFIX=${PREFIX} \
  35 + -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake \
  36 + -DANDROID_PLATFORM=${ANDROID_PLATFORM} \
  37 + -DANDROID_ABI=${ANDROID_ABI} \
  38 + -DANDROID_NDK=${ANDROID_NDK} \
  39 + -DANDROID_STL=c++_shared \
  40 + -DCMAKE_CXX_FLAGS='-fexceptions -frtti -w -Wall -std=c++17' \
  41 + -DINCLUDE_DIR=${PREFIX}/include \
  42 + -DLIB_DIR=${PREFIX}/lib/${ANDROID_ABI} \
  43 + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
  44 + -DENABLE_TRACE=${ENABLE_TRACE} \
  45 + -DWITH_STYLE='2048x1080' \
  46 + -DANDROID_HOST_COMPILER="$CXX"
31 fi 47 fi
32 48
33 -make -j8 || exit 1  
34 -make install || exit 1  
35 -cp -R ${DALI_DIR}/dali-toolkit/automated-tests/resources/fonts/* ${DALI_DIR}/dali-env/android/files/fonts  
36 - 49 +make -j8 install || exit 1
  50 +cp -R ${DALI_DIR}/dali-toolkit/automated-tests/resources/fonts/* ${DALI_ENV_DIR}/files/fonts
37 cd - 51 cd -
build/android/dali/env.sh
  View file @c5baff1
1 if [ ! -d "$ANDROID_SDK" ]; then 1 if [ ! -d "$ANDROID_SDK" ]; then
2 -# try default path  
3 -if [ -d "$HOME/Android/Sdk" ]; then  
4 -export ANDROID_SDK=$HOME/Android/Sdk  
5 -fi 2 + # try default path
  3 + if [ -d "$HOME/Android/Sdk" ]; then
  4 + export ANDROID_SDK=$HOME/Android/Sdk
  5 + fi
6 fi 6 fi
7 7
8 if [ ! -d "$ANDROID_NDK" ]; then 8 if [ ! -d "$ANDROID_NDK" ]; then
9 -if [ -d $ANDROID_SDK ]; then  
10 -NDK_DIR=$(find $ANDROID_SDK -maxdepth 2 -name ndk-build | sed 's/\/ndk-build//')  
11 -if [ -d "$NDK_DIR" ]; then  
12 -export ANDROID_NDK=$NDK_DIR  
13 -fi  
14 -fi 9 + if [ -d $ANDROID_SDK ]; then
  10 + NDK_DIR=$(find $ANDROID_SDK -maxdepth 2 -name ndk-build | sed 's/\/ndk-build//')
  11 + if [ -d "$NDK_DIR" ]; then
  12 + export ANDROID_NDK=$NDK_DIR
  13 + fi
  14 + fi
15 fi 15 fi
16 16
17 if [ ! -d "$DALI_DIR" ]; then 17 if [ ! -d "$DALI_DIR" ]; then