(Android Build) Use the sysroot defined by the system

Change-Id: If1947fed924e9f22f1c1bed0ddeee03aeb77f5d7

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index da3510f..18b4591 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -415,6 +415,9 @@ MESSAGE( STATUS "Enable AT-SPI:                    ${ENABLE_ATSPI}" )
 MESSAGE( STATUS "Tizen Platform Config supported   ${TIZEN_PLATFORM_CONFIG_SUPPORTED_LOGMSG}")
 MESSAGE( STATUS "Compile flags:                    ${CMAKE_CXX_FLAGS}")
 MESSAGE( STATUS "Compile flags:                    ${CMAKE_C_FLAGS}")
+MESSAGE( STATUS "CMAKE_SYSROOT:                    ${CMAKE_SYSROOT}")
+MESSAGE( STATUS "CMAKE_SYSTEM_INCLUDE_PATH:        ${CMAKE_SYSTEM_INCLUDE_PATH}")
+MESSAGE( STATUS "CMAKE_SYSTEM_LIBRARY_PATH:        ${CMAKE_SYSTEM_LIBRARY_PATH}")
 IF( enable_feedback )
   ADD_SUBDIRECTORY( plugins )
 ENDIF()

diff --git a/build/tizen/deps-check.cmake b/build/tizen/deps-check.cmake
index 7ce0606..6ed3a2d 100644 (file)
--- a/build/tizen/deps-check.cmake
+++ b/build/tizen/deps-check.cmake
@@ -114,8 +114,8 @@ IF( ANDROID_PROFILE )
   INCLUDE_DIRECTORIES( ${ANDROID_NDK}/sources )
   INCLUDE_DIRECTORIES( ${ANDROID_NDK}/sources/android )
   INCLUDE_DIRECTORIES( ${ANDROID_NDK}/sources/android/native_app_glue )
-  INCLUDE_DIRECTORIES( ${ANDROID_NDK}/sysroot/usr )
-  INCLUDE_DIRECTORIES( ${ANDROID_NDK}/sysroot/usr/include/android )
+  INCLUDE_DIRECTORIES( ${CMAKE_SYSROOT}/usr )
+  INCLUDE_DIRECTORIES( ${CMAKE_SYSROOT}/usr/include/android )
 ENDIF()
 
 IF( enable_wayland )