Make EWK buildable again for TV 3.0

With this patch and the previous one for our build scripts the
build_tv.sh -P tztv_v3.0 shoule once again produce working packages for
3.0 odroid target.

Change-Id: I750c2437f35b9417eb7fc036468052aa4d6d9a70
Signed-off-by: Piotr Tworek <p.tworek@samsung.com>

diff --git a/tizen_src/build/system.gyp b/tizen_src/build/system.gyp
index d52ef97..2f6153a 100644 (file)
--- a/tizen_src/build/system.gyp
+++ b/tizen_src/build/system.gyp
@@ -171,6 +171,48 @@
       ],
     }, # capi-appfw-application
     {
+      'target_name': 'capi-location-manager',
+      'type': 'none',
+      'conditions': [
+        ['building_for_tizen==1', {
+          'direct_dependent_settings': {
+            'cflags': [
+              '<!@(<(pkg-config) --cflags capi-location-manager)',
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '<!@(<(pkg-config) --libs-only-L --libs-only-other capi-location-manager)',
+            ],
+            'libraries': [
+              '<!@(<(pkg-config) --libs-only-l capi-location-manager)',
+            ],
+          },
+        }],
+      ],
+    }, # capi-location-manager
+    {
+      'target_name': 'capi-system-info',
+      'type': 'none',
+      'conditions': [
+        ['building_for_tizen==1', {
+          'direct_dependent_settings': {
+            'cflags': [
+              '<!@(<(pkg-config) --cflags capi-system-info)',
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '<!@(<(pkg-config) --libs-only-L --libs-only-other capi-system-info)',
+            ],
+            'libraries': [
+              '<!@(<(pkg-config) --libs-only-l capi-system-info)',
+            ],
+          },
+        }],
+      ],
+    }, # capi-system-info
+    {
       'target_name': 'libdri2',
       'type': 'none',
       'conditions': [
@@ -295,5 +337,47 @@
         }],
       ],
     }, # tts
+    {
+      'target_name': 'vconf',
+      'type': 'none',
+      'conditions': [
+        ['building_for_tizen==1', {
+          'direct_dependent_settings': {
+            'cflags': [
+              '<!@(<(pkg-config) --cflags vconf)',
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '<!@(<(pkg-config) --libs-only-L --libs-only-other vconf)',
+            ],
+            'libraries': [
+              '<!@(<(pkg-config) --libs-only-l vconf)',
+            ],
+          },
+        }],
+      ],
+    }, # vconf
+    {
+      'target_name': 'feedback',
+      'type': 'none',
+      'conditions': [
+        ['building_for_tizen==1', {
+          'direct_dependent_settings': {
+            'cflags': [
+              '<!@(<(pkg-config) --cflags feedback)',
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '<!@(<(pkg-config) --libs-only-L --libs-only-other feedback)',
+            ],
+            'libraries': [
+              '<!@(<(pkg-config) --libs-only-l feedback)',
+            ],
+          },
+        }],
+      ],
+    }, # feedback
   ],
 }

diff --git a/tizen_src/ewk/efl_integration/efl_integration.gypi b/tizen_src/ewk/efl_integration/efl_integration.gypi
index 3628b17..998c572 100644 (file)
--- a/tizen_src/ewk/efl_integration/efl_integration.gypi
+++ b/tizen_src/ewk/efl_integration/efl_integration.gypi
@@ -25,6 +25,10 @@
       '<(DEPTH)/tizen_src/build/system.gyp:ecore-evas',
       '<(DEPTH)/tizen_src/build/system.gyp:elementary',
       '<(DEPTH)/tizen_src/build/system.gyp:gstreamer',
+      '<(DEPTH)/tizen_src/build/system.gyp:vconf',
+      '<(DEPTH)/tizen_src/build/system.gyp:capi-location-manager',
+      '<(DEPTH)/tizen_src/build/system.gyp:capi-system-info',
+      '<(DEPTH)/tizen_src/build/system.gyp:feedback',
       '<(DEPTH)/tizen_src/ewk/po_tizen/locale.gyp:locale_efl',
       '<(DEPTH)/tizen_src/chromium_impl/efl/efl.gyp:efl-init',
 

diff --git a/tizen_src/ewk/efl_integration/eweb_view.cc b/tizen_src/ewk/efl_integration/eweb_view.cc
index ff7dbb1..4908d15 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_view.cc
+++ b/tizen_src/ewk/efl_integration/eweb_view.cc
@@ -1703,7 +1703,7 @@ bool EWebView::GetSnapshotAsync(Eina_Rectangle rect,
     Evas* canvas,
     tizen_webview::Web_App_Screenshot_Captured_Callback callback,
     void* user_data) {
-#ifdef OS_TIZEN
+#if defined(OS_TIZEN) && defined(EWK_REFACTOR)
   if (!rwhv())
     return false;
   int width = rect.w;
@@ -1746,7 +1746,7 @@ bool EWebView::GetSnapshotAsync(Eina_Rectangle rect,
 }
 
 void EWebView::GetSnapShotForRect(gfx::Rect& rect) {
-#ifdef OS_TIZEN
+#if defined(OS_TIZEN) && defined(EWK_REFACTOR)
   rwhv()->GetSnapshotForRect(rect);
 #endif
 }

diff --git a/tizen_src/ewk/efl_integration/private/ewk_favicon_database_private.h b/tizen_src/ewk/efl_integration/private/ewk_favicon_database_private.h
index 5bfd2cc..607a7ce 100644 (file)
--- a/tizen_src/ewk/efl_integration/private/ewk_favicon_database_private.h
+++ b/tizen_src/ewk/efl_integration/private/ewk_favicon_database_private.h
@@ -9,7 +9,7 @@
 
 #include <Evas.h>
 
-#include <../impl/browser/favicon/favicon_database.h>
+#include "browser/favicon/favicon_database.h"
 #include <tizen_webview/public/tw_web_context.h>
 #include "private/ewk_context_private.h"
 
@@ -43,4 +43,4 @@ struct EwkFaviconDatabase {
   FaviconDatabase* favicon_database;
 };
 #endif // ewk_favicon_database_private_h
-#endif
\ No newline at end of file
+#endif

diff --git a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc
index f5db880..039d28e 100644 (file)
--- a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc
+++ b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc
@@ -33,7 +33,7 @@
 
 #include "tizen_webview/public/tw_web_context.h"
 
-#if defined(OS_TIZEN)
+#if defined(OS_TIZEN_MOBILE)
 #include "content/public/browser/media_capture_devices.h"
 #include "media/video/capture/tizen/video_capture_device_tizen.h"
 #endif
@@ -66,7 +66,7 @@ void WritePdfDataToFile(printing::PdfMetafileSkia* metafile, const base::FilePat
   delete metafile;
 }
 
-#if defined(OS_TIZEN)
+#if defined(OS_TIZEN_MOBILE)
 static const content::MediaStreamDevice*
   GetRequestedVideoDevice(std::string& device_id) {
   const content::MediaStreamDevices& video_devices =
@@ -257,7 +257,7 @@ void WebContentsDelegateEfl::OnAccessRequestResponse(bool allowed) {
                                           "default", "Default"));
     }
     if (pending_request.request.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE) {
-#if defined(OS_TIZEN)
+#if defined(OS_TIZEN_MOBILE)
       const content::MediaStreamDevice* video_device =
           GetRequestedVideoDevice(pending_request.request.requested_video_device_id);
       if (video_device) {

diff --git a/tizen_src/ewk/efl_webview_app/efl_webview_app.gypi b/tizen_src/ewk/efl_webview_app/efl_webview_app.gypi
index 034d9ee..d6e7307 100644 (file)
--- a/tizen_src/ewk/efl_webview_app/efl_webview_app.gypi
+++ b/tizen_src/ewk/efl_webview_app/efl_webview_app.gypi
@@ -52,8 +52,11 @@
          'dependencies': [
           '<(DEPTH)/tizen_src/build/system.gyp:evas',
           '<(DEPTH)/tizen_src/build/system.gyp:ecore',
+          '<(DEPTH)/tizen_src/build/system.gyp:ecore-x',
           '<(DEPTH)/tizen_src/build/system.gyp:ecore-evas',
           '<(DEPTH)/tizen_src/build/system.gyp:elementary',
+          '<(DEPTH)/tizen_src/build/system.gyp:capi-appfw-application',
+          '<(DEPTH)/build/linux/system.gyp:glib',
           'chromium-ewk',
          ],
          'cflags': [