Peter M. Groen / dali-demo

Commit 704c91e58d14cf85fb7e60eae0ecdc141796d8fc

Authored by Cheng-Shiun Tsai
Committed by Adeel Kazmi
1 parent 36b871be

changing writing directory for Android 

/tmp doesn't exist for Android, need to use internal data directory

Change-Id: I08d8855baa97e175a2874915076d4fd22ff83d6f
Inline Side-by-side
Showing 4 changed files with 18 additions and 3 deletions
README.md
  View file @704c91e
... ... @@ -110,6 +110,10 @@ To install apks:
110 110 $ adb install -r ./app/build/outputs/apk/debug/dali-demo-debug.apk
111 111 $ adb install -r ./app/build/outputs/apk/release/dali-demo-release.apk
112 112  
  113 +Manually granting permission for accessing Storage before running the demo
  114 + 1. Long press the DALi demo app icon => App Info
  115 + 2. Permissions => Storage => Enable
  116 +
113 117 ## 4. Building for MS Windows
114 118  
115 119 Third party dependencies are built using vcpkg. Instructions on how to install vcpkg can be found in the
... ...
build/android/dali/build_demo.sh
  View file @704c91e
... ... @@ -21,8 +21,10 @@ else
21 21 export DALI_APP_RES_DIR=${PREFIX}/files
22 22 export DALI_APP_DIR=${PREFIX}/lib/${ANDROID_ABI}
23 23 export DALI_DEMO_RES_DIR=assets
  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
24 26  
25   - ${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}
  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}
26 28 fi
27 29  
28 30 make -j8 || exit 1
... ...
build/tizen/CMakeLists.txt
  View file @704c91e
... ... @@ -104,6 +104,15 @@ ENDIF()
104 104 SET(DEMO_EXAMPLE_BIN \\"${BINDIR}/\\")
105 105 SET(DEMO_LANG \\"${LANG}\\")
106 106  
  107 +#For run-time read/write directory
  108 +IF(ANDROID)
  109 + SET(DEMO_DATA_RW_DIR \\"/data/data/${DALI_DEMO_APP_ID}/\\")
  110 + SET(DEMO_DATA_PUBLIC_RW_DIR \\"/sdcard/\\")
  111 +ELSE()
  112 + SET(DEMO_DATA_RW_DIR \\"/tmp/\\")
  113 + SET(DEMO_DATA_PUBLIC_RW_DIR \\"/tmp/\\")
  114 +ENDIF()
  115 +
107 116 FILE(GLOB LOCAL_IMAGES_PNG RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.png")
108 117 FILE(GLOB LOCAL_IMAGES_JPG RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.jpg")
109 118 FILE(GLOB LOCAL_IMAGES_GIF RELATIVE "${LOCAL_IMAGES_DIR}" "${LOCAL_IMAGES_DIR}/*.gif")
... ... @@ -257,7 +266,7 @@ ELSEIF( UNIX )
257 266 )
258 267 ENDIF()
259 268  
260   -SET(DALI_DEMO_CFLAGS "-DDEMO_GAME_DIR=${DEMO_GAME_DIR} -DDEMO_IMAGE_DIR=${DEMO_IMAGE_DIR} -DDEMO_VIDEO_DIR=${DEMO_VIDEO_DIR} -DDEMO_MODEL_DIR=${DEMO_MODEL_DIR} -DDEMO_SCRIPT_DIR=${DEMO_SCRIPT_DIR} -DDEMO_SHADER_DIR=${DEMO_SHADER_DIR} -DDEMO_STYLE_DIR=${DEMO_STYLE_DIR} -DDEMO_THEME_PATH=${DEMO_THEME_PATH} -DDEMO_EXAMPLE_BIN=${DEMO_EXAMPLE_BIN} -DDEMO_LOCALE_DIR=${DEMO_LOCALE_DIR} -DDEMO_LANG=${DEMO_LANG}")
  269 +SET(DALI_DEMO_CFLAGS "-DDEMO_GAME_DIR=${DEMO_GAME_DIR} -DDEMO_IMAGE_DIR=${DEMO_IMAGE_DIR} -DDEMO_VIDEO_DIR=${DEMO_VIDEO_DIR} -DDEMO_MODEL_DIR=${DEMO_MODEL_DIR} -DDEMO_SCRIPT_DIR=${DEMO_SCRIPT_DIR} -DDEMO_SHADER_DIR=${DEMO_SHADER_DIR} -DDEMO_STYLE_DIR=${DEMO_STYLE_DIR} -DDEMO_THEME_PATH=${DEMO_THEME_PATH} -DDEMO_EXAMPLE_BIN=${DEMO_EXAMPLE_BIN} -DDEMO_LOCALE_DIR=${DEMO_LOCALE_DIR} -DDEMO_LANG=${DEMO_LANG} -DDEMO_DATA_RW_DIR=${DEMO_DATA_RW_DIR} -DDEMO_DATA_PUBLIC_RW_DIR=${DEMO_DATA_PUBLIC_RW_DIR} ")
261 270  
262 271 IF( ENABLE_DEBUG )
263 272 SET(DALI_DEMO_CFLAGS "${DALI_DEMO_CFLAGS} -DDEBUG_ENABLED")
... ...
examples/native-image-source/native-image-source-example.cpp
  View file @704c91e
... ... @@ -32,7 +32,7 @@ const float BUTTON_HEIGHT = 100.0f;
32 32 const float BUTTON_COUNT = 5.0f;
33 33  
34 34 const std::string JPG_FILENAME = DEMO_IMAGE_DIR "gallery-medium-4.jpg";
35   -const std::string CAPTURE_FILENAME = "/tmp/native-image-capture.png";
  35 +const std::string CAPTURE_FILENAME = DEMO_DATA_PUBLIC_RW_DIR "native-image-capture.png";
36 36  
37 37 /**
38 38 * @brief Creates a shader used to render a native image
... ...