Ensure 64-bit android build works as well

Change-Id: I2031cc6b7a436a87a9a229ebc0d1650336e2fee0

diff --git a/build/tizen/builder/CMakeLists.txt b/build/tizen/builder/CMakeLists.txt
index 5cbdfa6..06c7068 100644 (file)
--- a/build/tizen/builder/CMakeLists.txt
+++ b/build/tizen/builder/CMakeLists.txt
@@ -2,6 +2,10 @@ SET(BUILDER_SRC_DIR ${ROOT_SRC_DIR}/builder)
 
 SET(DALI_BUILDER_SRCS ${BUILDER_SRC_DIR}/dali-builder.cpp)
 SET(DALI_BUILDER_SRCS ${DALI_BUILDER_SRCS} "${ROOT_SRC_DIR}/shared/resources-location.cpp")
-ADD_EXECUTABLE(dali-builder ${DALI_BUILDER_SRCS})
-TARGET_LINK_LIBRARIES(dali-builder ${REQUIRED_PKGS_LDFLAGS})
+IF(SHARED)
+  ADD_LIBRARY(dali-builder SHARED ${DALI_BUILDER_SRCS})
+ELSE()
+  ADD_EXECUTABLE(dali-builder ${DALI_BUILDER_SRCS})
+ENDIF()
+TARGET_LINK_LIBRARIES(dali-builder ${REQUIRED_PKGS_LDFLAGS} -pie)
 INSTALL(TARGETS dali-builder DESTINATION ${BINDIR})