Fix build error in widget object module

- Ideally widget module needs to be built separately and
  not included in "wrt". Same is there in xwalk.
- But in electron currently, the build system is tightly
  coupled with wrt executable, so no module can be build
  as static_lib separately.
- Currently coping widget_object in lib directory so that
  "wrt" exe will not give linking error.

- Need to find way to build widget object as static lib
  without directly linking to "wrt" exe

Change-Id: Ia5a5584f5b2165c1be5b5bd9eafc49a3d45ef195
Signed-off-by: Prathmesh <prathmesh.m@samsung.com>

diff --git a/packaging/electron-efl.spec b/packaging/electron-efl.spec
index 93ce41fe9485b22405701beff28535202dac12da..4f7009a6bab701d451552b9772ae0bc089512bdd 100755 (executable)
--- a/packaging/electron-efl.spec
+++ b/packaging/electron-efl.spec
@@ -143,6 +143,7 @@ install -p -m 644 %{_out}/lib/libxwalk_extension_shared.so %{buildroot}%{_libdir
 install -p -m 755 %{_out}/lib/libxwalk_injected_bundle.so %{buildroot}%{_libdir}
 # widget plugin
 install -p -m 644 %{_out}/lib/libwidget_plugin.so %{buildroot}%{extension_path}
+install -p -m 644 %{_out}/lib/libwidget_plugin.so %{buildroot}%{_libdir}
 install -p -m 644 %{_out}/gen/widget.json %{buildroot}%{extension_path}
 
 %post
@@ -177,5 +178,6 @@ rm -fr %{buildroot}
 %attr(644,root,root) %{_libdir}/libwrt_common.so
 %attr(644,root,root) %{_libdir}/libxwalk_extension_shared.so
 %attr(644,root,root) %{_libdir}/libxwalk_injected_bundle.so
+%attr(644,root,root) %{_libdir}/libwidget_plugin.so
 %attr(644,root,root) %{extension_path}/libwidget_plugin.so
 %attr(644,root,root) %{extension_path}/widget.json

diff --git a/wrt.gyp b/wrt.gyp
index 38a93374ff0c7c7c6309c7b6ba6421ac97abb3bd..73af0b566a88321a3ca7ed78bf19592872625ad2 100644 (file)
--- a/wrt.gyp
+++ b/wrt.gyp
@@ -14,6 +14,7 @@
         '<(DEPTH)/tizen/common/common.gyp:wrt_common',
         '<(DEPTH)/tizen/loader/loader.gyp:wrt-loader',
         '<(DEPTH)/tizen/extensions/extensions.gyp:xwalk_extension_shared',
+        '<(DEPTH)/tizen/extensions/extensions.gyp:widget_plugin',
         '<(DEPTH)/tizen/renderer/injected_bundle.gyp:xwalk_injected_bundle',
         '<(DEPTH)/efl/build/system.gyp:ecore',
         '<(DEPTH)/efl/build/system.gyp:launchpad',
@@ -203,12 +204,5 @@
         },
       ],
     },  # target electron_shell_copy
-    {
-      'target_name': 'extension_wrt',
-      'type': 'none',
-      'dependencies': [
-          '<(DEPTH)/tizen/extensions/extensions.gyp:widget_plugin',
-      ],
-    }, # end of target 'extension_wrt'
   ],
 }