Peter M. Groen / dali-demo

Commit 062fc5b285e7d9c915eb35ef7d8e8e97f1e8f898

Authored by Adeel Kazmi
1 parent 9d252fe4

(Android) Use Platform Version 30 

Change-Id: Id5478ac210a2373d3ed825063c6437be53bdc1f7
Inline Side-by-side
Showing 6 changed files with 9 additions and 9 deletions
build/android/app/build.gradle
  View file @062fc5b
@@ -17,11 +17,11 @@ android { @@ -17,11 +17,11 @@ android {
17 keyPassword "Samsung" 17 keyPassword "Samsung"
18 } 18 }
19 } 19 }
20 - compileSdkVersion 28 20 + compileSdkVersion 30
21 defaultConfig { 21 defaultConfig {
22 applicationId = 'com.sec.dalidemo' 22 applicationId = 'com.sec.dalidemo'
23 minSdkVersion 26 23 minSdkVersion 26
24 - targetSdkVersion 26 24 + targetSdkVersion 30
25 versionCode 1 25 versionCode 1
26 versionName "1.0" 26 versionName "1.0"
27 externalNativeBuild { 27 externalNativeBuild {
@@ -76,7 +76,7 @@ android { @@ -76,7 +76,7 @@ android {
76 } 76 }
77 externalNativeBuild { 77 externalNativeBuild {
78 cmake { 78 cmake {
79 - version '3.10.2' 79 + version '3.22.1'
80 path 'src/main/cpp/CMakeLists.txt' 80 path 'src/main/cpp/CMakeLists.txt'
81 } 81 }
82 } 82 }
@@ -95,7 +95,7 @@ dependencies { @@ -95,7 +95,7 @@ dependencies {
95 task buildDaliDependencies(type:Exec) { 95 task buildDaliDependencies(type:Exec) {
96 environment "PREFIX", daliEnvDir 96 environment "PREFIX", daliEnvDir
97 environment "ANDROID_ABI", androidABI 97 environment "ANDROID_ABI", androidABI
98 - environment "ANDROID_PLATFORM", "26" 98 + environment "ANDROID_PLATFORM", "latest"
99 if (buildType == 'debug') 99 if (buildType == 'debug')
100 environment "DEBUG", "1" 100 environment "DEBUG", "1"
101 workingDir file(daliDir + '/android-dependencies/cmake').getAbsolutePath() 101 workingDir file(daliDir + '/android-dependencies/cmake').getAbsolutePath()
build/android/build.sh
  View file @062fc5b
@@ -36,7 +36,7 @@ if [ ! -d "$ANDROID_SDK" ]; then @@ -36,7 +36,7 @@ if [ ! -d "$ANDROID_SDK" ]; then
36 unzip -q $androidCommandLineToolsPkgName 36 unzip -q $androidCommandLineToolsPkgName
37 SDK_MANAGER="$ROOT_DIR/Android/Sdk/cmdline-tools/bin/sdkmanager --sdk_root=$ROOT_DIR/Android/Sdk $SdbProxyOptions" 37 SDK_MANAGER="$ROOT_DIR/Android/Sdk/cmdline-tools/bin/sdkmanager --sdk_root=$ROOT_DIR/Android/Sdk $SdbProxyOptions"
38 $SDK_MANAGER --update 38 $SDK_MANAGER --update
39 - yes | $SDK_MANAGER "platform-tools" "platforms;android-29" "build-tools;29.0.2" "cmake;3.10.2.4988404" "ndk-bundle" "ndk;22.1.7171670" 39 + yes | $SDK_MANAGER "platform-tools" "platforms;android-30" "build-tools;33.0.1" "cmake;3.22.1" "ndk-bundle" "ndk;25.1.8937393"
40 cd - 40 cd -
41 fi 41 fi
42 fi 42 fi
build/android/dali/build_adaptor.sh
  View file @062fc5b
@@ -19,7 +19,7 @@ else @@ -19,7 +19,7 @@ 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.10.2.4988404/bin/cmake ${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 + ${ANDROID_SDK}/cmake/3.22.1/bin/cmake ${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
23 fi 23 fi
24 24
25 make -j8 || exit 1 25 make -j8 || exit 1
build/android/dali/build_core.sh
  View file @062fc5b
@@ -18,7 +18,7 @@ else @@ -18,7 +18,7 @@ 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.10.2.4988404/bin/cmake ${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} 21 + ${ANDROID_SDK}/cmake/3.22.1/bin/cmake ${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 22 fi
23 23
24 make -j8 || exit 1 24 make -j8 || exit 1
build/android/dali/build_demo.sh
  View file @062fc5b
@@ -24,7 +24,7 @@ else @@ -24,7 +24,7 @@ else
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 26
27 - ${ANDROID_SDK}/cmake/3.10.2.4988404/bin/cmake ${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} 27 + ${ANDROID_SDK}/cmake/3.22.1/bin/cmake ${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 fi 28 fi
29 29
30 make -j8 || exit 1 30 make -j8 || exit 1
build/android/dali/build_toolkit.sh
  View file @062fc5b
@@ -27,7 +27,7 @@ else @@ -27,7 +27,7 @@ else
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 29
30 - ${ANDROID_SDK}/cmake/3.10.2.4988404/bin/cmake ${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='720x1280' -DANDROID_HOST_COMPILER="$CXX" 30 + ${ANDROID_SDK}/cmake/3.22.1/bin/cmake ${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='720x1280' -DANDROID_HOST_COMPILER="$CXX"
31 fi 31 fi
32 32
33 make -j8 || exit 1 33 make -j8 || exit 1