projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Trace use scope macro instead of begin-end" into devel/master
[platform/core/uifw/dali-adaptor.git]
/
build
/
tizen
/
profiles
/
android-profile.cmake
diff --git
a/build/tizen/profiles/android-profile.cmake
b/build/tizen/profiles/android-profile.cmake
old mode 100755
(executable)
new mode 100644
(file)
index
5a0ff5a
..
36b45e0
--- a/
build/tizen/profiles/android-profile.cmake
+++ b/
build/tizen/profiles/android-profile.cmake
@@
-7,8
+7,10
@@
SET( SOURCES
${adaptor_accessibility_common_src_files}
${adaptor_accessibility_android_src_files}
${adaptor_adaptor_common_src_files}
${adaptor_accessibility_common_src_files}
${adaptor_accessibility_android_src_files}
${adaptor_adaptor_common_src_files}
+ ${adaptor_canvas_renderer_generic_src_files}
${adaptor_clipboard_common_src_files}
${adaptor_clipboard_android_src_files}
${adaptor_clipboard_common_src_files}
${adaptor_clipboard_android_src_files}
+ ${adaptor_drag_and_drop_generic_src_files}
${adaptor_framework_android_src_files}
${devel_api_src_files}
${adaptor_devel_api_text_abstraction_src_files}
${adaptor_framework_android_src_files}
${devel_api_src_files}
${adaptor_devel_api_text_abstraction_src_files}
@@
-42,14
+44,25
@@
SET( SOURCES
${adaptor_window_system_android_src_files}
${adaptor_trace_common_src_files}
${adaptor_thread_common_src_files}
${adaptor_window_system_android_src_files}
${adaptor_trace_common_src_files}
${adaptor_thread_common_src_files}
+ ${adaptor_thread_linux_src_files}
${devel_api_text_abstraction_src_files}
${static_libraries_libunibreak_src_files}
${devel_api_text_abstraction_src_files}
${static_libraries_libunibreak_src_files}
- ${static_libraries_glyphy_src_files}
- ${static_libraries_nanosvg_src_files}
${adaptor_addons_common_src_files}
${adaptor_addons_dummy_src_files}
)
${adaptor_addons_common_src_files}
${adaptor_addons_dummy_src_files}
)
+IF( ENABLE_VECTOR_BASED_TEXT_RENDERING )
+ SET( SOURCES ${SOURCES}
+ ${static_libraries_glyphy_src_files}
+ )
+ENDIF()
+
+IF( NOT thorvg_support)
+ SET( SOURCES ${SOURCES}
+ ${static_libraries_nanosvg_src_files}
+ )
+ENDIF()
+
IF( ENABLE_ANDROIDJNI_FRAMEWORK )
SET( SOURCES ${SOURCES}
${adaptor_adaptor_androidjni_src_files}
IF( ENABLE_ANDROIDJNI_FRAMEWORK )
SET( SOURCES ${SOURCES}
${adaptor_adaptor_androidjni_src_files}