Make EWK buildable again for Tizen Mobile (part II)

Patch adds some missing dependencies so that Tizen
mobile builds succeed. Namely, the following dependencies
were missing:
- ui-gadget
- efl-assist
- capi-system-device
- capi-system-sensor
- capi-media-camera

Also some extra code is guarded under EWK_REFACTOR.

Change-Id: I8d406ed9e067241a3ce06582734befb1162dd3e4

diff --git a/tizen_src/build/system.gyp b/tizen_src/build/system.gyp
index 2f6153a..2e00a25 100644 (file)
--- a/tizen_src/build/system.gyp
+++ b/tizen_src/build/system.gyp
@@ -150,6 +150,27 @@
       ],
     }, # efl-assist
     {
+      'target_name': 'ui-gadget',
+      'type': 'none',
+      'conditions': [
+        ['building_for_tizen_mobile==1', {
+          'direct_dependent_settings': {
+            'cflags': [
+              '<!@(<(pkg-config) --cflags ui-gadget-1)',
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '<!@(<(pkg-config) --libs-only-L --libs-only-other ui-gadget-1)',
+            ],
+            'libraries': [
+              '<!@(<(pkg-config) --libs-only-l ui-gadget-1)',
+            ],
+          },
+        }],
+      ],
+    }, # ui-gadget
+    {
       'target_name': 'capi-appfw-application',
       'type': 'none',
       'conditions': [
@@ -213,6 +234,48 @@
       ],
     }, # capi-system-info
     {
+      'target_name': 'capi-system-device',
+      'type': 'none',
+      'conditions': [
+        ['building_for_tizen_mobile==1', {
+          'direct_dependent_settings': {
+            'cflags': [
+              '<!@(<(pkg-config) --cflags capi-system-device)',
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '<!@(<(pkg-config) --libs-only-L --libs-only-other capi-system-device)',
+            ],
+            'libraries': [
+              '<!@(<(pkg-config) --libs-only-l capi-system-device)',
+            ],
+          },
+        }],
+      ],
+    }, # capi-system-device
+    {
+      'target_name': 'capi-system-sensor',
+      'type': 'none',
+      'conditions': [
+        ['building_for_tizen_mobile==1', {
+          'direct_dependent_settings': {
+            'cflags': [
+              '<!@(<(pkg-config) --cflags capi-system-sensor)',
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '<!@(<(pkg-config) --libs-only-L --libs-only-other capi-system-sensor)',
+            ],
+            'libraries': [
+              '<!@(<(pkg-config) --libs-only-l capi-system-sensor)',
+            ],
+          },
+        }],
+      ],
+    }, # capi-system-sensor
+    {
       'target_name': 'libdri2',
       'type': 'none',
       'conditions': [
@@ -317,6 +380,27 @@
       },
     }, # gstreamer
     {
+      'target_name': 'capi-media-camera',
+      'type': 'none',
+      'conditions': [
+        ['building_for_tizen_mobile==1', {
+          'direct_dependent_settings': {
+            'cflags': [
+              '<!@(<(pkg-config) --cflags capi-media-camera)',
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '<!@(<(pkg-config) --libs-only-L --libs-only-other capi-media-camera)',
+            ],
+            'libraries': [
+              '<!@(<(pkg-config) --libs-only-l capi-media-camera)',
+            ],
+          },
+        }],
+      ],
+    }, # capi-media-camera
+    {
       'target_name': 'tts',
       'type': 'none',
       'conditions': [

diff --git a/tizen_src/chromium_impl/content/content_efl.gypi b/tizen_src/chromium_impl/content/content_efl.gypi
index bfe8721..b8eb313 100644 (file)
--- a/tizen_src/chromium_impl/content/content_efl.gypi
+++ b/tizen_src/chromium_impl/content/content_efl.gypi
@@ -19,6 +19,7 @@
       '<(DEPTH)/tizen_src/chromium_impl/efl/efl.gyp:window-factory',
       '<(DEPTH)/tizen_src/build/system.gyp:gstreamer',
       '<(DEPTH)/tizen_src/build/system.gyp:tts',
+      '<(DEPTH)/tizen_src/build/system.gyp:capi-system-sensor',
     ],
     'external_content_renderer_deps': [
       '<(DEPTH)/tizen_src/build/system.gyp:tts',

diff --git a/tizen_src/chromium_impl/device/battery_tizen.gypi b/tizen_src/chromium_impl/device/battery_tizen.gypi
index 3f2df1c..934cea1 100644 (file)
--- a/tizen_src/chromium_impl/device/battery_tizen.gypi
+++ b/tizen_src/chromium_impl/device/battery_tizen.gypi
@@ -3,6 +3,11 @@
 # found in the LICENSE file.
 
 {
+  'variables': {
+    'external_device_battery_deps': [
+      '<(DEPTH)/tizen_src/build/system.gyp:capi-system-device',
+    ],
+  },
   'target_defaults': {
     'target_conditions': [
       ['_target_name=="device_battery"', {

diff --git a/tizen_src/chromium_impl/media/media_efl.gypi b/tizen_src/chromium_impl/media/media_efl.gypi
index 280604d..ed7613d 100644 (file)
--- a/tizen_src/chromium_impl/media/media_efl.gypi
+++ b/tizen_src/chromium_impl/media/media_efl.gypi
@@ -8,6 +8,7 @@
       '<(DEPTH)/tizen_src/build/system.gyp:ecore',
       '<(DEPTH)/tizen_src/build/system.gyp:ecore-x',
       '<(DEPTH)/tizen_src/build/system.gyp:gstreamer',
+      '<(DEPTH)/tizen_src/build/system.gyp:capi-media-camera',
     ],
   },
 

diff --git a/tizen_src/chromium_impl/media/video/capture/tizen/video_capture_device_tizen.cc b/tizen_src/chromium_impl/media/video/capture/tizen/video_capture_device_tizen.cc
index 914178c..4e1d1d6 100644 (file)
--- a/tizen_src/chromium_impl/media/video/capture/tizen/video_capture_device_tizen.cc
+++ b/tizen_src/chromium_impl/media/video/capture/tizen/video_capture_device_tizen.cc
@@ -4,13 +4,19 @@
 
 #include "media/video/capture/tizen/video_capture_device_tizen.h"
 
-#include "eweb_view.h"
-
 //#define WEBRTC_DEBUG_DUMPFILE
-
 #if defined(WEBRTC_DEBUG_DUMPFILE)
 #include <fcntl.h>
 #include <unistd.h>
+#endif
+
+#include "base/bind.h"
+#if defined(EWK_REFACTOR)
+// TODO: remove this dependency.
+#include "eweb_view.h"
+#endif
+
+#if defined(WEBRTC_DEBUG_DUMPFILE)
 int fd;
 #endif
 
@@ -175,7 +181,7 @@ void VideoCaptureDeviceTizen::OnCameraCaptured(camera_preview_data_s* frame,
             << " height:" << frame->height
             << " format:" << toString(frame->format);
 
-#if defined(OS_TIZEN_MOBILE)
+#if defined(OS_TIZEN_MOBILE) && defined(EWK_REFACTOR)
   int orientation = EWebView::GetOrientation();
 #else
   int orientation = 0;

diff --git a/tizen_src/ewk/efl_integration/efl_integration.gypi b/tizen_src/ewk/efl_integration/efl_integration.gypi
index 998c572..43ef11c 100644 (file)
--- a/tizen_src/ewk/efl_integration/efl_integration.gypi
+++ b/tizen_src/ewk/efl_integration/efl_integration.gypi
@@ -28,7 +28,10 @@
       '<(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:capi-media-camera',
       '<(DEPTH)/tizen_src/build/system.gyp:feedback',
+      '<(DEPTH)/tizen_src/build/system.gyp:efl-assist',
+      '<(DEPTH)/tizen_src/build/system.gyp:ui-gadget',
       '<(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_webview_app/efl_webview_app.gypi b/tizen_src/ewk/efl_webview_app/efl_webview_app.gypi
index d6e7307..c2ca04d 100644 (file)
--- a/tizen_src/ewk/efl_webview_app/efl_webview_app.gypi
+++ b/tizen_src/ewk/efl_webview_app/efl_webview_app.gypi
@@ -14,6 +14,7 @@
        }],
 
       'dependencies': [
+        '<(DEPTH)/tizen_src/build/system.gyp:capi-system-device',
         '<(DEPTH)/tizen_src/build/system.gyp:evas',
         '<(DEPTH)/tizen_src/build/system.gyp:ecore',
         '<(DEPTH)/tizen_src/build/system.gyp:ecore-evas',
@@ -50,12 +51,14 @@
           '../efl_integration',
          ],
          'dependencies': [
+          '<(DEPTH)/tizen_src/build/system.gyp:capi-appfw-application',
+          '<(DEPTH)/tizen_src/build/system.gyp:capi-system-device',
           '<(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:efl-assist',
           '<(DEPTH)/tizen_src/build/system.gyp:elementary',
-          '<(DEPTH)/tizen_src/build/system.gyp:capi-appfw-application',
           '<(DEPTH)/build/linux/system.gyp:glib',
           'chromium-ewk',
          ],