[Tizen][m38] Fix TV build

Patch excludes print related code from mobile AND TV
(fixing an undefined reference problem) when building
for target.

Patch also fixes the build_tv.sh script which was simply
not right: it was building for mobile.

Bug: http://107.108.218.239/bugzilla/show_bug.cgi?id=5676

Change-Id: Ib0de8ee3ef8bf0faf2b91d78b96ed0a21f2ba697
Signed-off-by: Antonio Gomes <a1.gomes@samsung.com>

diff --git a/tizen_src/build/build_tv.sh b/tizen_src/build/build_tv.sh
index 49776d4..53c0404 100755 (executable)
--- a/tizen_src/build/build_tv.sh
+++ b/tizen_src/build/build_tv.sh
@@ -8,4 +8,9 @@ SCRIPTDIR=$(cd $(dirname $0); pwd -P)
 # copy patched files (for GCC 4.5)
 . ${SCRIPTDIR}/copy_patched_files.sh
 
-gbs build  -A armv7l --incremental "$@"
+GBS_CONF=$HOME/.gbs.conf
+if [ ! -f $GBS_CONF  ]; then
+    GBS_CONF=${SCRIPTDIR}/gbs.conf
+fi
+
+gbs --conf $GBS_CONF build -P tizentv_product -A armv7l --incremental "$@"

diff --git a/tizen_src/impl/renderer/render_view_observer_efl.cc b/tizen_src/impl/renderer/render_view_observer_efl.cc
index 6650af5..a0bc288 100644 (file)
--- a/tizen_src/impl/renderer/render_view_observer_efl.cc
+++ b/tizen_src/impl/renderer/render_view_observer_efl.cc
@@ -300,7 +300,7 @@ void RenderViewObserverEfl::OnDoHitTest(int view_x, int view_y, tizen_webview::H
 
 void RenderViewObserverEfl::OnPrintToPdf(int width, int height, const base::FilePath& filename)
 {
-#if !(defined(EWK_BRINGUP) && defined(OS_TIZEN_MOBILE))
+#if !(defined(EWK_BRINGUP) && defined(OS_TIZEN))
   blink::WebView* web_view = render_view()->GetWebView();
   DCHECK(web_view);
   PrintWebViewHelperEfl print_helper(render_view(), filename);

diff --git a/tizen_src/impl/web_contents_delegate_efl.cc b/tizen_src/impl/web_contents_delegate_efl.cc
index d19e1c2..78ceeae 100755 (executable)
--- a/tizen_src/impl/web_contents_delegate_efl.cc
+++ b/tizen_src/impl/web_contents_delegate_efl.cc
@@ -463,7 +463,7 @@ void WebContentsDelegateEfl::OnGetContentSecurityPolicy(IPC::Message* reply_msg)
 }
 
 void WebContentsDelegateEfl::OnPrintedMetafileReceived(const DidPrintPagesParams& params) {
-#if !(defined(EWK_BRINGUP) && defined(OS_TIZEN_MOBILE))
+#if !(defined(EWK_BRINGUP) && defined(OS_TIZEN))
   base::SharedMemory shared_buf(params.metafile_data_handle, true);
   if (!shared_buf.Map(params.data_size)) {
      NOTREACHED() << "couldn't map";