Merge "Build configuration for wearable" into tizen

diff --git a/adaptors/x11/event-handler-x.cpp b/adaptors/x11/event-handler-x.cpp
index bd89e51..2c945f8 100644 (file)
--- a/adaptors/x11/event-handler-x.cpp
+++ b/adaptors/x11/event-handler-x.cpp
@@ -259,7 +259,7 @@ struct EventHandler::Impl
       // Register Vconf notify - font name, font size and style
       vconf_notify_key_changed( DALI_VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME, VconfNotifyFontNameChanged, handler );
       vconf_notify_key_changed( VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, VconfNotifyFontSizeChanged, handler );
-#if defined(DALI_PROFILE_MOBILE)
+#if defined(DALI_PROFILE_MOBILE) || defined(DALI_PROFILE_LITE)
       vconf_notify_key_changed( VCONFKEY_SETAPPL_CHANGE_UI_THEME_INT, VconfNotifyThemeChanged, handler );
 #endif
     }
@@ -270,7 +270,7 @@ struct EventHandler::Impl
    */
   ~Impl()
   {
-#if defined(DALI_PROFILE_MOBILE)
+#if defined(DALI_PROFILE_MOBILE) || defined(DALI_PROFILE_LITE)
     vconf_ignore_key_changed( VCONFKEY_SETAPPL_CHANGE_UI_THEME_INT, VconfNotifyThemeChanged );
 #endif
     vconf_ignore_key_changed( VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, VconfNotifyFontSizeChanged );

diff --git a/build/tizen/Makefile.am b/build/tizen/Makefile.am
index c4e8eca..92e52eb 100644 (file)
--- a/build/tizen/Makefile.am
+++ b/build/tizen/Makefile.am
@@ -17,8 +17,10 @@
 SUBDIRS = common dali-adaptor dali-application
 
 if ! LITE_PROFILE
+if ! WEARABLE_PROFILE
 SUBDIRS += plugins
 endif
+endif
 
 if MOBILE_PROFILE
 SUBDIRS += dali-evas dali-native-buffer

diff --git a/build/tizen/common/Makefile.am b/build/tizen/common/Makefile.am
index f08a74b..1d73d7f 100644 (file)
--- a/build/tizen/common/Makefile.am
+++ b/build/tizen/common/Makefile.am
@@ -85,12 +85,14 @@ include ../../../adaptors/public-api/file.list
 
 # Feedback Plugin
 if ! LITE_PROFILE
+if ! WEARABLE_PROFILE
 plugin_themes_dir = ../../../adaptors/common/feedback
 dali_plugin_theme_files = $(plugin_themes_dir)/default-feedback-theme.json
 
 dalifeedbackthemedir = ${dataReadOnlyDir}/themes/feedback-themes/
 dalifeedbacktheme_DATA = ${dali_plugin_theme_files}
 endif
+endif
 
 if TURBO_JPEG_IS_ON
   slp_platform_abstraction_src_files += $(slp_platform_abstraction_src_dir)/resource-loader/loader-jpeg-turbo.cpp