Do not include chromium internal headers in ewk header

This patch does not include build_config.h to ewk headers, but to ewk
sources in order to resolve build breaks that occur in modules that
reference chromium-efl.

Change-Id: Ic683dfce4c3e516a00121e005bdf1bb34516171f
Signed-off-by: yh106.jung <yh106.jung@samsung.com>

diff --git a/tizen_src/ewk/efl_integration/public/ewk_context_menu.cc b/tizen_src/ewk/efl_integration/public/ewk_context_menu.cc
index 6347a38..3b8e6ae 100644 (file)
--- a/tizen_src/ewk/efl_integration/public/ewk_context_menu.cc
+++ b/tizen_src/ewk/efl_integration/public/ewk_context_menu.cc
@@ -5,6 +5,7 @@
 #include "ewk_context_menu_product.h"
 
 #include <Eina.h>
+#include "build/build_config.h"
 #include "private/ewk_private.h"
 #include "private/ewk_context_menu_private.h"
 #include "context_menu_controller_efl.h"
@@ -144,16 +145,24 @@ Eina_Bool ewk_context_menu_hide(Ewk_Context_Menu* menu)
   return false;
 }
 
-#if BUILDFLAG(IS_TIZEN_TV)
 int ewk_context_menu_pos_x_get(Ewk_Context_Menu* menu)
 {
+#if BUILDFLAG(IS_TIZEN_TV)
   LOG_EWK_API_MOCKUP();
   return 0;
+#else
+  LOG_EWK_API_MOCKUP("Only for Tizen TV.");
+  return 0;
+#endif
 }
 
 int ewk_context_menu_pos_y_get(Ewk_Context_Menu* menu)
 {
+#if BUILDFLAG(IS_TIZEN_TV)
   LOG_EWK_API_MOCKUP();
   return 0;
+#else
+  LOG_EWK_API_MOCKUP("Only for Tizen TV.");
+  return 0;
+#endif
 }
-#endif  // IS_TIZEN_TV

diff --git a/tizen_src/ewk/efl_integration/public/ewk_context_menu_product.h b/tizen_src/ewk/efl_integration/public/ewk_context_menu_product.h
index 4d5ba0a..dd7fdc4 100644 (file)
--- a/tizen_src/ewk/efl_integration/public/ewk_context_menu_product.h
+++ b/tizen_src/ewk/efl_integration/public/ewk_context_menu_product.h
@@ -33,8 +33,6 @@
 
 #include "ewk_context_menu_internal.h"
 
-#include "build/build_config.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -111,7 +109,6 @@ EXPORT_API Eina_Bool ewk_context_menu_item_select(Ewk_Context_Menu *menu, Ewk_Co
  */
 EXPORT_API Eina_Bool ewk_context_menu_hide(Ewk_Context_Menu *menu);
 
-#if BUILDFLAG(IS_TIZEN_TV)
 /**
  * Gets the x_position of context menu.
  *
@@ -127,7 +124,6 @@ EXPORT_API int ewk_context_menu_pos_x_get(Ewk_Context_Menu* menu);
  * @return the y_position of context menu on success or @c 0 on failure
  */
 EXPORT_API int ewk_context_menu_pos_y_get(Ewk_Context_Menu* menu);
-#endif  // IS_TIZEN_TV
 
 #ifdef __cplusplus
 }

diff --git a/tizen_src/ewk/efl_integration/public/ewk_media_playback_info.cc b/tizen_src/ewk/efl_integration/public/ewk_media_playback_info.cc
index 980cc50..b7baf7e 100644 (file)
--- a/tizen_src/ewk/efl_integration/public/ewk_media_playback_info.cc
+++ b/tizen_src/ewk/efl_integration/public/ewk_media_playback_info.cc
@@ -24,6 +24,8 @@
  */
 
 #include "ewk_media_playback_info_product.h"
+
+#include "build/build_config.h"
 #include "private/ewk_private.h"
 
 const char* ewk_media_playback_info_media_url_get(
@@ -71,24 +73,37 @@ const int ewk_media_playback_info_video_id_get(Ewk_Media_Playback_Info* data)
   LOG_EWK_API_MOCKUP();
 }
 
-#if BUILDFLAG(IS_TIZEN_TV)
 Ewk_Media_Playback_Info* ewkMediaPlaybackInfoCreate(const int player_id,
                                                     const char* url,
                                                     const char* mime_type)
 {
+#if BUILDFLAG(IS_TIZEN_TV)
   LOG_EWK_API_MOCKUP();
   return NULL;
+#else
+  LOG_EWK_API_MOCKUP("Only for Tizen TV.");
+  return NULL;
+#endif
+
 }
 
 Eina_Bool ewk_media_playback_info_media_resource_acquired_get(
     Ewk_Media_Playback_Info* data)
 {
+#if BUILDFLAG(IS_TIZEN_TV)
   LOG_EWK_API_MOCKUP();
   return EINA_FALSE;
+#else
+  LOG_EWK_API_MOCKUP("Only for Tizen TV.");
+  return EINA_FALSE;
+#endif
 }
 
 void ewkMediaPlaybackInfoDelete(Ewk_Media_Playback_Info* data)
 {
+#if BUILDFLAG(IS_TIZEN_TV)
   LOG_EWK_API_MOCKUP();
-}
+#else
+  LOG_EWK_API_MOCKUP("Only for Tizen TV.");
 #endif
+}

diff --git a/tizen_src/ewk/efl_integration/public/ewk_media_playback_info_product.h b/tizen_src/ewk/efl_integration/public/ewk_media_playback_info_product.h
index 895c9e0..a7689d5 100644 (file)
--- a/tizen_src/ewk/efl_integration/public/ewk_media_playback_info_product.h
+++ b/tizen_src/ewk/efl_integration/public/ewk_media_playback_info_product.h
@@ -35,8 +35,6 @@
 #include <Evas.h>
 #include <tizen.h>
 
-#include "build/build_config.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -120,14 +118,12 @@ EXPORT_API void ewk_media_playback_info_drm_info_set(
     Ewk_Media_Playback_Info* data,
     const char* drm_info);
 
-#if BUILDFLAG(IS_TIZEN_TV)
 Ewk_Media_Playback_Info* ewkMediaPlaybackInfoCreate(const int player_id,
                                                     const char* url,
                                                     const char* mime_type);
 Eina_Bool ewk_media_playback_info_media_resource_acquired_get(
     Ewk_Media_Playback_Info* data);
 void ewkMediaPlaybackInfoDelete(Ewk_Media_Playback_Info* data);
-#endif
 
 #ifdef __cplusplus
 }

diff --git a/tizen_src/ewk/efl_integration/public/ewk_media_subtitle_info.cc b/tizen_src/ewk/efl_integration/public/ewk_media_subtitle_info.cc
index 3a681da..7c0cb73 100644 (file)
--- a/tizen_src/ewk/efl_integration/public/ewk_media_subtitle_info.cc
+++ b/tizen_src/ewk/efl_integration/public/ewk_media_subtitle_info.cc
@@ -3,6 +3,8 @@
 // found in the LICENSE file.
 
 #include "ewk_media_subtitle_info_product.h"
+
+#include "build/build_config.h"
 #include "private/ewk_private.h"
 
 int ewk_media_subtitle_info_id_get(Ewk_Media_Subtitle_Info *data)
@@ -53,26 +55,42 @@ const void* ewk_media_subtitle_data_get(Ewk_Media_Subtitle_Data *data)
   return NULL;
 }
 
-#if BUILDFLAG(IS_TIZEN_TV)
 Ewk_Media_Subtitle_Info* ewkMediaSubtitleInfoCreate(int id, const char* url, const char* lang, const char* label)
 {
+#if BUILDFLAG(IS_TIZEN_TV)
   LOG_EWK_API_MOCKUP();
   return NULL;
+#else
+  LOG_EWK_API_MOCKUP("Only for Tizen TV.");
+  return NULL;
+#endif
 }
 
 void ewkMediaSubtitleInfoDelete(Ewk_Media_Subtitle_Info* data)
 {
+#if BUILDFLAG(IS_TIZEN_TV)
   LOG_EWK_API_MOCKUP();
+#else
+  LOG_EWK_API_MOCKUP("Only for Tizen TV.");
+#endif
 }
 
 Ewk_Media_Subtitle_Data* ewkMediaSubtitleDataCreate(int id, double timestamp, const void* data, unsigned size)
 {
+#if BUILDFLAG(IS_TIZEN_TV)
   LOG_EWK_API_MOCKUP();
   return NULL;
+#else
+  LOG_EWK_API_MOCKUP("Only for Tizen TV.");
+  return NULL;
+#endif
 }
 
 void ewkMediaSubtitleDataDelete(Ewk_Media_Subtitle_Data* data)
 {
+#if BUILDFLAG(IS_TIZEN_TV)
   LOG_EWK_API_MOCKUP();
-}
+#else
+  LOG_EWK_API_MOCKUP("Only for Tizen TV.");
 #endif
+}

diff --git a/tizen_src/ewk/efl_integration/public/ewk_media_subtitle_info_product.h b/tizen_src/ewk/efl_integration/public/ewk_media_subtitle_info_product.h
index 678eb2d..6036ad8 100644 (file)
--- a/tizen_src/ewk/efl_integration/public/ewk_media_subtitle_info_product.h
+++ b/tizen_src/ewk/efl_integration/public/ewk_media_subtitle_info_product.h
@@ -35,8 +35,6 @@
 #include <Evas.h>
 #include <tizen.h>
 
-#include "build/build_config.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -117,7 +115,6 @@ EXPORT_API unsigned ewk_media_subtitle_data_size_get(Ewk_Media_Subtitle_Data *da
 */
 EXPORT_API const void* ewk_media_subtitle_data_get(Ewk_Media_Subtitle_Data *data);
 
-#if BUILDFLAG(IS_TIZEN_TV)
 Ewk_Media_Subtitle_Info* ewkMediaSubtitleInfoCreate(int id, const char* url,
 const char* lang, const char* label);
 
@@ -127,7 +124,6 @@ Ewk_Media_Subtitle_Data* ewkMediaSubtitleDataCreate(int id, double timestamp,
 const void* data, unsigned size);
 
 void ewkMediaSubtitleDataDelete(Ewk_Media_Subtitle_Data* data);
-#endif
 
 #ifdef __cplusplus
 }