TizenRefApp-5900 [Email] Replace in log macros with private API on to public

Change-Id: Id6407196c7eb62fea728c1514224f06d76050996

diff --git a/Project-Files/common/inc/email-debug.h b/Project-Files/common/inc/email-debug.h
index 40656cb..cd0bf57 100644 (file)
--- a/Project-Files/common/inc/email-debug.h
+++ b/Project-Files/common/inc/email-debug.h
@@ -37,6 +37,9 @@
 
 G_BEGIN_DECLS
 
+#undef _debug
+#undef _debug_secure
+
 #undef debug_trace
 #undef debug_log
 #undef debug_warning
@@ -65,88 +68,100 @@ G_BEGIN_DECLS
 #undef debug_enter
 #undef debug_leave
 
-#ifdef _DEBUG
-
-// LOG Level: V < D < I < W < E < F
-#define debug_trace(fmt, args...)              do { LOGD(fmt, ##args); } while (0)
-#define debug_log(fmt, args...)                        do { LOGI(fmt, ##args); } while (0)
-#define debug_warning(fmt, args...)            do { LOGW(fmt, ##args); } while (0)
-#define debug_error(fmt, args...)              do { LOGE(fmt, ##args); } while (0)
-#define debug_critical(fmt, args...)           do { LOGE(fmt, ##args); } while (0)
-#define debug_fatal(fmt, args...)              do { LOGF(fmt, ##args); } while (0)
+#ifndef __MODULE__
+#define __MODULE__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
+#endif
 
 #define COND(expr)     (__builtin_expect((expr) != 0, 0))
 
-#define debug_trace_if(expr, fmt, args...)             do { if (COND(expr)) LOGD(fmt, ##args); } while (0)
-#define debug_log_if(expr, fmt, args...)               do { if (COND(expr)) LOGI(fmt, ##args); } while (0)
-#define debug_warning_if(expr, fmt, args...)   do { if (COND(expr)) LOGW(fmt, ##args); } while (0)
-#define debug_error_if(expr, fmt, args...)             do { if (COND(expr)) LOGE(fmt, ##args); } while (0)
-#define debug_fatal_if(expr, fmt, args...)             do { if (COND(expr)) LOGF(fmt, ##args); } while (0)
+#define _debug(prio, fmt, arg...) \
+       dlog_print(prio, LOG_TAG, "%s: %s(%d) > " fmt, __MODULE__, __func__, __LINE__, ##arg)
+
+#define _debug_secure(prio, fmt, arg...) \
+       dlog_print(prio, LOG_TAG, "%s: %s(%d) > [SECURE_LOG] " fmt, __MODULE__, __func__, __LINE__, ##arg)
+
+#define _debug_nop(fmt, args...) _debug_nop_impl("" fmt, ##args)
+
+#define _debug_nop_expr(expr, fmt, args...) _debug_nop_expr_impl(expr, "" fmt, ##args)
+
+static inline int _debug_nop_impl(const char *fmt __attribute__((unused)), ...) { return 0; }
+static inline int _debug_nop_expr_impl(bool expr __attribute__((unused)),
+               const char *fmt __attribute__((unused)), ...) { return 0; }
+
+#define debug_warning(fmt, args...)            _debug(DLOG_WARN, fmt, ##args)
+#define debug_error(fmt, args...)              _debug(DLOG_ERROR, fmt, ##args)
+#define debug_fatal(fmt, args...)              _debug(DLOG_FATAL, fmt, ##args)
+#define debug_critical(fmt, args...)   _debug(DLOG_ERROR, fmt, ##args)
+
+#define debug_warning_if(expr, fmt, args...)   do { if (COND(expr)) debug_warning(fmt, ##args); } while (0)
+#define debug_error_if(expr, fmt, args...)             do { if (COND(expr)) debug_error(fmt, ##args); } while (0)
+#define debug_fatal_if(expr, fmt, args...)             do { if (COND(expr)) debug_fatal(fmt, ##args); } while (0)
 
 #ifdef TIZEN_DEBUG_ENABLE
-#define debug_secure_trace(fmt, args...)               do { SECURE_LOGD(fmt, ##args); } while (0)
-#define debug_secure(fmt, args...)             do { SECURE_LOGI(fmt, ##args); } while (0)
-#define debug_secure_warning(fmt, args...)             do { SECURE_LOGW(fmt, ##args); } while (0)
-#define debug_secure_error(fmt, args...)               do { SECURE_LOGE(fmt, ##args); } while (0)
-#define debug_secure_fatal(fmt, args...)               do { SECURE_LOGF(fmt, ##args); } while (0)
-
-#define debug_secure_trace_if(expr, fmt, args...)              do { if (COND(expr)) SECURE_LOGD(fmt, ##args); } while (0)
-#define debug_secure_log_if(expr, fmt, args...)                do { if (COND(expr)) SECURE_LOGI(fmt, ##args); } while (0)
-#define debug_secure_warning_if(expr, fmt, args...)    do { if (COND(expr)) SECURE_LOGW(fmt, ##args); } while (0)
-#define debug_secure_error_if(expr, fmt, args...)              do { if (COND(expr)) SECURE_LOGE(fmt, ##args); } while (0)
-#define debug_secure_fatal_if(expr, fmt, args...)              do { if (COND(expr)) SECURE_LOGF(fmt, ##args); } while (0)
+#define debug_secure_warning(fmt, args...)     _debug_secure(DLOG_WARN, fmt, ##args)
+#define debug_secure_error(fmt, args...)       _debug_secure(DLOG_ERROR, fmt, ##args)
+#define debug_secure_fatal(fmt, args...)       _debug_secure(DLOG_FATAL, fmt, ##args)
+
+#define debug_secure_warning_if(expr, fmt, args...)    do { if (COND(expr)) debug_secure_warning(fmt, ##args); } while (0)
+#define debug_secure_error_if(expr, fmt, args...)      do { if (COND(expr)) debug_secure_error(fmt, ##args); } while (0)
+#define debug_secure_fatal_if(expr, fmt, args...)      do { if (COND(expr)) debug_secure_fatal(fmt, ##args); } while (0)
 #else
-#define debug_secure_trace(fmt, args...)
-#define debug_secure(fmt, args...)
-#define debug_secure_warning(fmt, args...)
-#define debug_secure_error(fmt, args...)
-#define debug_secure_fatal(fmt, args...)
-
-#define debug_secure_trace_if(expr, fmt, args...)
-#define debug_secure_log_if(expr, fmt, args...)
-#define debug_secure_warning_if(expr, fmt, args...)
-#define debug_secure_error_if(expr, fmt, args...)
-#define debug_secure_fatal_if(expr, fmt, args...)
-#endif
+#define debug_secure_warning(fmt, args...)     _debug_nop(fmt, ##args)
+#define debug_secure_error(fmt, args...)       _debug_nop(fmt, ##args)
+#define debug_secure_fatal(fmt, args...)       _debug_nop(fmt, ##args)
+
+#define debug_secure_warning_if(expr, fmt, args...)    _debug_nop_expr(expr, fmt, ##args)
+#define debug_secure_error_if(expr, fmt, args...)      _debug_nop_expr(expr, fmt, ##args)
+#define debug_secure_fatal_if(expr, fmt, args...)      _debug_nop_expr(expr, fmt, ##args)
+#endif /* TIZEN_DEBUG_ENABLE */
+
+#ifdef _DEBUG
+
+#define debug_trace(fmt, args...)              _debug(DLOG_DEBUG, fmt, ##args)
+#define debug_log(fmt, args...)                        _debug(DLOG_INFO, fmt, ##args)
 
-#define debug_enter()                                  do { debug_trace(" * Enter *"); } while (0)
-#define debug_leave()                                  do { debug_trace(" * Leave *"); } while (0)
+#define debug_trace_if(expr, fmt, args...)             do { if (COND(expr)) debug_trace(fmt, ##args); } while (0)
+#define debug_log_if(expr, fmt, args...)               do { if (COND(expr)) debug_log(fmt, ##args); } while (0)
+
+#ifdef TIZEN_DEBUG_ENABLE
+#define debug_secure_trace(fmt, args...)       _debug_secure(DLOG_DEBUG, fmt, ##args)
+#define debug_secure(fmt, args...)                     _debug_secure(DLOG_INFO, fmt, ##args)
+
+#define debug_secure_trace_if(expr, fmt, args...)      do { if (COND(expr)) debug_secure_trace(fmt, ##args); } while (0)
+#define debug_secure_log_if(expr, fmt, args...)                do { if (COND(expr)) debug_secure(fmt, ##args); } while (0)
+#else
+#define debug_secure_trace(fmt, args...)       _debug_nop(fmt, ##args)
+#define debug_secure(fmt, args...)                     _debug_nop(fmt, ##args)
+
+#define debug_secure_trace_if(expr, fmt, args...)      _debug_nop_expr(expr, fmt, ##args)
+#define debug_secure_log_if(expr, fmt, args...)                _debug_nop_expr(expr, fmt, ##args)
+#endif /* TIZEN_DEBUG_ENABLE */
+
+#define debug_enter()  debug_trace(" * Enter *")
+#define debug_leave()  debug_trace(" * Leave *")
 
 #else  /* _DEBUG */
 
-#define debug_trace(fmt, args...) do { NOP("" fmt, ##args); } while (0)
-#define debug_log(fmt, args...) do { NOP("" fmt, ##args); } while (0)
-#define debug_warning(fmt, args...) do { NOP("" fmt, ##args); } while (0)
-#define debug_error(fmt, args...) do { NOP("" fmt, ##args); } while (0)
-#define debug_critical(fmt, args...) do { NOP("" fmt, ##args); } while (0)
-#define debug_fatal(fmt, args...) do { NOP("" fmt, ##args); } while (0)
-
-#define debug_trace_if(fmt, args...)
-#define debug_log_if(fmt, args...)
-#define debug_warning_if(expr, fmt, args...) do { if (expr) NOP("" fmt, ##args); } while (0)
-#define debug_error_if(expr, fmt, args...) do { if (expr) NOP("" fmt, ##args); } while (0)
-#define debug_fatal_if(expr, fmt, args...) do { if (expr) NOP("" fmt, ##args); } while (0)
-
-#define debug_secure_trace(fmt, args...)
-#define debug_secure(fmt, args...)
-#define debug_secure_warning(fmt, args...)
-#define debug_secure_error(fmt, args...)
-#define debug_secure_fatal(fmt, args...)
-
-#define debug_secure_trace_if(fmt, args...)
-#define debug_secure_log_if(fmt, args...)
-#define debug_secure_warning_if(fmt, args...)
-#define debug_secure_error_if(fmt, args...)
-#define debug_secure_fatal_if(fmt, args...)
-
-#define debug_enter()
-#define debug_leave()
+#define debug_trace(fmt, args...)              _debug_nop(fmt, ##args)
+#define debug_log(fmt, args...)                        _debug_nop(fmt, ##args)
+
+#define debug_trace_if(fmt, args...)   _debug_nop_expr(expr, fmt, ##args)
+#define debug_log_if(fmt, args...)             _debug_nop_expr(expr, fmt, ##args)
+
+#define debug_secure_trace(fmt, args...)       _debug_nop(fmt, ##args)
+#define debug_secure(fmt, args...)                     _debug_nop(fmt, ##args)
+
+#define debug_secure_trace_if(fmt, args...)    _debug_nop_expr(expr, fmt, ##args)
+#define debug_secure_log_if(fmt, args...)      _debug_nop_expr(expr, fmt, ##args)
+
+#define debug_enter()  _debug_nop("")
+#define debug_leave()  _debug_nop("")
 
 #endif /* _DEBUG */
 
 #define RETURN_IF_FAIL(expr) \
        do { \
-               if (!(expr)) { \
+               if (!COND(expr)) { \
                        debug_error("expr : (%s) failed", #expr); \
                        return; \
                } \
@@ -154,7 +169,7 @@ G_BEGIN_DECLS
 
 #define RETURN_VAL_IF_FAIL(expr, val) \
        do { \
-               if (!(expr)) { \
+               if (!COND(expr)) { \
                        debug_error("expr : (%s) failed", #expr); \
                        return (val); \
                } \
@@ -162,58 +177,50 @@ G_BEGIN_DECLS
 
 #define ret_if(expr) \
        do { \
-               if (expr) { \
+               if (COND(expr)) { \
                        return; \
                } \
        } while (0)
 
 #define retv_if(expr, val) \
        do { \
-               if (expr) { \
+               if (COND(expr)) { \
                        return (val); \
                } \
        } while (0)
 
 #define retm_if(expr, fmt, arg...) \
        do { \
-               if (expr) { \
+               if (COND(expr)) { \
                        debug_error(fmt, ##arg); \
                        return; \
                } \
        } while (0)
 
-#define warn_if(expr, fmt, arg...) \
+#define retvm_if(expr, val, fmt, arg...) \
        do { \
-               if (expr) { \
-                       debug_warning(fmt, ##arg); \
+               if (COND(expr)) { \
+                       debug_error(fmt, ##arg); \
+                       return (val); \
                } \
        } while (0)
 
 #define gotom_if(expr, label, fmt, arg...) \
        do { \
-               if (expr) { \
+               if (COND(expr)) { \
                        debug_error(fmt, ##arg); \
                        goto label; \
                } \
        } while (0)
 
-#define retvm_if(expr, val, fmt, arg...) \
+#define break_if(expr, fmt, arg...) \
        do { \
-               if (expr) { \
+               if (COND(expr)) { \
                        debug_error(fmt, ##arg); \
-                       return (val); \
+                       break; \
                } \
        } while (0)
 
-typedef enum {
-       EMAIL_DEBUG_CRITICAL = 0,
-       EMAIL_DEBUG_WARNING,
-       EMAIL_DEBUG_EXPR,
-       EMAIL_DEBUG_TIME,
-       EMAIL_DEBUG_LOG,
-       EMAIL_DEBUG_MAX
-} EmailDebugType;
-
 G_END_DECLS
 #endif /* _EMAIL_DEBUG_H_ */
 

diff --git a/Project-Files/common/src/email-module-core.c b/Project-Files/common/src/email-module-core.c
index d7d826e..b20ffe2 100644 (file)
--- a/Project-Files/common/src/email-module-core.c
+++ b/Project-Files/common/src/email-module-core.c
@@ -2069,7 +2069,7 @@ void _email_view_item_del_cb(void *data, Evas_Object *obj, void *event_info)
 
        debug_enter();
        retm_if(!data && !event_info, "data and event_info are NULL");
-       warn_if(!data, "data is NULL");
+       debug_warning_if(!data, "data is NULL");
 
        /* If deleted item is popped item */
        if (MODULE_MGR.popped_item == event_info) {

diff --git a/Project-Files/common/src/email-params.c b/Project-Files/common/src/email-params.c
index 3bd0e2b..4cb79cd 100644 (file)
--- a/Project-Files/common/src/email-params.c
+++ b/Project-Files/common/src/email-params.c
@@ -94,7 +94,7 @@ EMAIL_API void email_params_free(email_params_h *params)
 
        if (*params) {
                int ret = bundle_free(*params);
-               warn_if(ret != BUNDLE_ERROR_NONE, "bundle_free() failed! ret = %d", ret);
+               debug_warning_if(ret != BUNDLE_ERROR_NONE, "bundle_free() failed! ret = %d", ret);
 
                *params = NULL;
        }

diff --git a/Project-Files/modules/composer/inc/email-composer-util.h b/Project-Files/modules/composer/inc/email-composer-util.h
index 1c36e06..2576540 100644 (file)
--- a/Project-Files/modules/composer/inc/email-composer-util.h
+++ b/Project-Files/modules/composer/inc/email-composer-util.h
@@ -45,13 +45,15 @@ enum {
        RESIZE_IMAGE_ORIGINAL_SIZE = 100
 };
 
+#ifdef _DEBUG
 #define _USE_PROFILE_
+#endif
 #ifdef _USE_PROFILE_
 #define email_profiling_begin(pfid) \
        struct timeval __prf_1_##pfid; \
        do { \
                gettimeofday(&__prf_1_##pfid, 0); \
-               __dlog_print(LOG_ID_MAIN, DLOG_DEBUG, "PROFILING", "[ BEGIN ] "#pfid" -> %u.%06u", (unsigned int)__prf_1_##pfid.tv_sec, (unsigned int)__prf_1_##pfid.tv_usec); \
+               debug_trace("PROFILING [ BEGIN ] "#pfid" -> %u.%06u", (unsigned int)__prf_1_##pfid.tv_sec, (unsigned int)__prf_1_##pfid.tv_usec); \
        } while (0)
 
 #define email_profiling_end(pfid) \
@@ -61,7 +63,7 @@ enum {
                long __ds = __prf_2_##pfid.tv_sec - __prf_1_##pfid.tv_sec; \
                long __dm = __prf_2_##pfid.tv_usec - __prf_1_##pfid.tv_usec; \
                if ( __dm < 0 ) { __ds--; __dm = 1000000 + __dm; } \
-               __dlog_print(LOG_ID_MAIN, DLOG_DEBUG, "PROFILING", "[Elapsed] "#pfid" -> %u.%06u", (unsigned int)(__ds), (unsigned int)(__dm)); \
+               debug_trace("PROFILING [Elapsed] "#pfid" -> %u.%06u", (unsigned int)(__ds), (unsigned int)(__dm)); \
        } while (0)
 #else
 #define email_profiling_begin(pfid)

diff --git a/Project-Files/modules/mailbox/src/email-mailbox-list.c b/Project-Files/modules/mailbox/src/email-mailbox-list.c
index 2f0f9d3..1d2809a 100644 (file)
--- a/Project-Files/modules/mailbox/src/email-mailbox-list.c
+++ b/Project-Files/modules/mailbox/src/email-mailbox-list.c
@@ -1110,7 +1110,7 @@ static email_mail_list_item_t *_mailbox_get_mail_list_by_mailbox_id(int account_
        _make_sorting_rule_list(sort_type, account_id, sorting_rule_list);
 
        err = email_get_mail_list_ex(filter_list, cnt_filter_list, sorting_rule_list, cnt_soring_rule, -1, -1, &mail_list, mail_count);
-       warn_if(err != EMAIL_ERROR_NONE, "email_get_mail_list_ex - err (%d)", err);
+       debug_warning_if(err != EMAIL_ERROR_NONE, "email_get_mail_list_ex - err (%d)", err);
 
        FREE(sorting_rule_list);
        email_free_list_filter(&filter_list, cnt_filter_list);
@@ -1246,7 +1246,7 @@ static email_mail_list_item_t *_mailbox_get_mail_list_by_mailbox_type(int accoun
        _make_sorting_rule_list(sort_type, account_id, sorting_rule_list);
 
        err = email_get_mail_list_ex(filter_list, cnt_filter_list, sorting_rule_list, cnt_soring_rule, -1, -1, &mail_list, mail_count);
-       warn_if(err != EMAIL_ERROR_NONE, "email_get_mail_list_ex - err (%d)", err);
+       debug_warning_if(err != EMAIL_ERROR_NONE, "email_get_mail_list_ex - err (%d)", err);
 
        FREE(sorting_rule_list);
        email_free_list_filter(&filter_list, cnt_filter_list);
@@ -1345,7 +1345,7 @@ static email_mail_list_item_t *_mailbox_get_priority_sender_mail_list(int sort_t
        _make_sorting_rule_list(sort_type, 0, sorting_rule_list);
 
        err = email_get_mail_list_ex(filter_list, j, sorting_rule_list, cnt_soring_rule, -1, -1, &mail_list, mail_count);
-       warn_if(err != EMAIL_ERROR_NONE, "email_get_mail_list_ex - err (%d)", err);
+       debug_warning_if(err != EMAIL_ERROR_NONE, "email_get_mail_list_ex - err (%d)", err);
 
        FREE(sorting_rule_list);
        email_free_list_filter(&filter_list, cnt_filter_list);
@@ -1467,7 +1467,7 @@ static email_mail_list_item_t *_mailbox_get_favourite_mail_list(int sort_type, i
        _make_sorting_rule_list(sort_type, 0, sorting_rule_list);
 
        err = email_get_mail_list_ex(filter_list, cnt_filter_list, sorting_rule_list, cnt_soring_rule, -1, -1, &mail_list, mail_count);
-       warn_if(err != EMAIL_ERROR_NONE, "email_get_mail_list_ex - err (%d)", err);
+       debug_warning_if(err != EMAIL_ERROR_NONE, "email_get_mail_list_ex - err (%d)", err);
 
        FREE(sorting_rule_list);
        email_free_list_filter(&filter_list, cnt_filter_list);
@@ -2726,7 +2726,7 @@ bool mailbox_check_searched_mail(int mail_id, void *data)
                _add_search_data_into_filter_list(search_data, filter_list, &i);
 
        err = email_count_mail(filter_list, cnt_filter_list, &total_count, &unread_count);
-       warn_if(err != EMAIL_ERROR_NONE, "email_count_mail - err (%d)", err);
+       debug_warning_if(err != EMAIL_ERROR_NONE, "email_count_mail - err (%d)", err);
 
        email_free_list_filter(&filter_list, cnt_filter_list);
 

diff --git a/Project-Files/modules/mailbox/src/email-mailbox-request.c b/Project-Files/modules/mailbox/src/email-mailbox-request.c
index eeb8651..94de902 100644 (file)
--- a/Project-Files/modules/mailbox/src/email-mailbox-request.c
+++ b/Project-Files/modules/mailbox/src/email-mailbox-request.c
@@ -366,7 +366,7 @@ static void _mailbox_move_mail_req_cb(email_request_h request)
                        gotom_if(!mail_info, CLEANUP, "no email exits(%d)", *idx);
 
                        err = email_close_db();
-                       warn_if(err != EMAIL_ERROR_NONE, "fail to close db - err(%d)", err);
+                       debug_warning_if(err != EMAIL_ERROR_NONE, "fail to close db - err(%d)", err);
 
                        MailItemData *ld = mailbox_list_make_mail_item_data(mail_info, NULL, view);
                        gotom_if(!ld, CLEANUP, "mailbox_list_make_mail_item_data() failed.");
@@ -621,7 +621,7 @@ static void _mailbox_add_mail_req_cb(email_request_h request)
        gotom_if(!mail_info, CLEANUP, "mail_info is NULL");
 
        err = email_close_db();
-       warn_if(err != EMAIL_ERROR_NONE, "fail to close db - err(%d)", err);
+       debug_warning_if(err != EMAIL_ERROR_NONE, "fail to close db - err(%d)", err);
 
        if (mail_info->message_class == EMAIL_MESSAGE_CLASS_SMS && mail_info->save_status == EMAIL_MAIL_STATUS_SAVED_OFFLINE) {
                debug_log("This is EAS SMS message. It will be added on the next sync operation");

diff --git a/SDK-3.0-Projects/email/.cproject b/SDK-3.0-Projects/email/.cproject
index ec26bab..f860227 100644 (file)
--- a/SDK-3.0-Projects/email/.cproject
+++ b/SDK-3.0-Projects/email/.cproject
@@ -26,7 +26,7 @@
                                                                <option id="gnu.cpp.compiler.option.optimization.level.2094780226" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
                                                                <option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.1537991202" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.1523618383" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm36.armel.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-3.0-device.core.private_llvm36.armel.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1176462851" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
@@ -148,7 +148,7 @@
                                                                <option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.1417551598" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
                                                                <option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.1930760565" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
                                                                <option id="sbi.gnu.c.compiler.option.694582685" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm36.armel.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-3.0-device.core.private_llvm36.armel.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.144987042" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
@@ -295,7 +295,7 @@
                                                        <tool id="org.tizen.nativecore.tool.sbi.gnu.archiver.mergelib.1611393507" name="Archive Generator" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver.mergelib"/>
                                                        <tool id="org.tizen.nativecore.tool.sbi.po.compiler.1856774696" name="PO Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.po.compiler"/>
                                                        <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.578191361" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler">
-                                                               <option id="sbi.gnu.edc.compiler.option.misc.id.879597268" name="Image Path (-id)" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList">
+                                                               <option command="-id " id="sbi.gnu.edc.compiler.option.misc.id.879597268" name="Image Path (-id)" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/edc_images}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/edc_images/composer_icon}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/edc_images/list_icon}&quot;"/>
@@ -305,8 +305,8 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/res/images/composer_icon}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/res/images/list_icon}&quot;"/>
                                                                </option>
-                                                               <option id="sbi.gnu.edc.compiler.option.misc.sd.1070783399" name="Sound Path (-sd)" superClass="sbi.gnu.edc.compiler.option.misc.sd"/>
-                                                               <option id="sbi.gnu.edc.compiler.option.misc.fd.1159250073" name="Font Path (-fd)" superClass="sbi.gnu.edc.compiler.option.misc.fd"/>
+                                                               <option command="-sd " id="sbi.gnu.edc.compiler.option.misc.sd.1070783399" name="Sound Path (-sd)" superClass="sbi.gnu.edc.compiler.option.misc.sd"/>
+                                                               <option command="-fd " id="sbi.gnu.edc.compiler.option.misc.fd.1159250073" name="Font Path (-fd)" superClass="sbi.gnu.edc.compiler.option.misc.fd"/>
                                                        </tool>
                                                </toolChain>
                                        </folderInfo>
@@ -345,7 +345,7 @@
                                                                <option id="gnu.cpp.compiler.option.optimization.level.1701289191" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
                                                                <option defaultValue="gnu.cpp.compiler.debugging.level.default" id="sbi.gnu.cpp.compiler.option.debugging.level.core.1284337376" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.626099143" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm36.armel.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-3.0-device.core.private_llvm36.armel.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.981270356" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
@@ -466,7 +466,7 @@
                                                                <option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.option.optimization.level.2015369817" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
                                                                <option defaultValue="gnu.c.debugging.level.default" id="sbi.gnu.c.compiler.option.debugging.level.core.494821323" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
                                                                <option id="sbi.gnu.c.compiler.option.1092442948" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm36.armel.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-3.0-device.core.private_llvm36.armel.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.379204472" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
@@ -612,7 +612,7 @@
                                                        <tool id="org.tizen.nativecore.tool.sbi.gnu.archiver.mergelib.652761047" name="Archive Generator" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver.mergelib"/>
                                                        <tool id="org.tizen.nativecore.tool.sbi.po.compiler.1730923067" name="PO Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.po.compiler"/>
                                                        <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.36745342" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler">
-                                                               <option id="sbi.gnu.edc.compiler.option.misc.id.457450646" name="Image Path (-id)" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList">
+                                                               <option command="-id " id="sbi.gnu.edc.compiler.option.misc.id.457450646" name="Image Path (-id)" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/edc_images}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/edc_images/composer_icon}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/edc_images/list_icon}&quot;"/>
@@ -622,8 +622,8 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/res/images/composer_icon}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/res/images/list_icon}&quot;"/>
                                                                </option>
-                                                               <option id="sbi.gnu.edc.compiler.option.misc.sd.371048442" name="Sound Path (-sd)" superClass="sbi.gnu.edc.compiler.option.misc.sd"/>
-                                                               <option id="sbi.gnu.edc.compiler.option.misc.fd.731638430" name="Font Path (-fd)" superClass="sbi.gnu.edc.compiler.option.misc.fd"/>
+                                                               <option command="-sd " id="sbi.gnu.edc.compiler.option.misc.sd.371048442" name="Sound Path (-sd)" superClass="sbi.gnu.edc.compiler.option.misc.sd"/>
+                                                               <option command="-fd " id="sbi.gnu.edc.compiler.option.misc.fd.731638430" name="Font Path (-fd)" superClass="sbi.gnu.edc.compiler.option.misc.fd"/>
                                                        </tool>
                                                </toolChain>
                                        </folderInfo>