Restructure chromium-efl.gyp (build entry point)

Patch creates a "build_all"-like target for EWK,
where all the sample apps are set as 'dependencies'.
It also deliberately removes the explicit inclusion of
efl_integration.gypi (where the 'chromium-ewk' target is
declared).

Reasoning is that 'chromium-ewk' is set as an explicit
dependecy of all three targets currently listed in chromium-ewk.gyp,
so its inclusion is redundant.
Also, the explicit inclusion of efl_integration.gypi from
chromium-ewk.gyp caused GYP error when we try to set 'chromium-ewk'
target as a dependency for 'xwalk' target:

[XXs] IndexError: string index out of range while reading
includes of /(..)/tizen_src/ewk/chromium-ewk.gyp while trying to load
/(..)/tizen_src/ewk/chromium-ewk.gyp

Reference: https://groups.google.com/forum/#!topic/gyp-developer/J-0xR5wye30

Bug: http://107.108.218.239/bugzilla/show_bug.cgi?id=13316
Reviewed by: Hyunhak Kim, arno renevier

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

diff --git a/tizen_src/ewk/chromium-ewk.gyp b/tizen_src/ewk/chromium-ewk.gyp
index 20dfb65..f3d97d7 100644 (file)
--- a/tizen_src/ewk/chromium-ewk.gyp
+++ b/tizen_src/ewk/chromium-ewk.gyp
@@ -3,10 +3,16 @@
 # found in the LICENSE file.
 
 {
-  'includes': [
-    'unittest/ewk-tests.gypi',
-    'ubrowser/ubrowser.gypi',
-    'efl_webview_app/efl_webview_app.gypi',
-    'efl_integration/efl_integration.gypi'
+  'targets': [
+    {
+      'target_name': 'chromium_efl_all',
+      'type': 'none',
+
+      'dependencies': [
+        'unittest/ewk-tests.gypi:*',
+        'ubrowser/ubrowser.gypi:*',
+        'efl_webview_app/efl_webview_app.gypi:*',
+      ],
+    },
   ],
 }

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 2ecf703..e904940 100644 (file)
--- a/tizen_src/ewk/efl_webview_app/efl_webview_app.gypi
+++ b/tizen_src/ewk/efl_webview_app/efl_webview_app.gypi
@@ -19,8 +19,8 @@
         '<(DEPTH)/tizen_src/build/system.gyp:ecore',
         '<(DEPTH)/tizen_src/build/system.gyp:ecore-evas',
         '<(DEPTH)/tizen_src/build/system.gyp:elementary',
-        'chromium-ewk',
-        'launch_exec',
+        '<(DEPTH)/tizen_src/ewk/efl_integration/efl_integration.gypi:chromium-ewk',
+        '<(DEPTH)/tizen_src/ewk/efl_integration/efl_integration.gypi:launch_exec',
       ],
       'conditions': [
         ['use_wayland==0', {
@@ -70,8 +70,8 @@
             '<(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/ewk/efl_integration/efl_integration.gypi:chromium-ewk',
             '<(DEPTH)/build/linux/system.gyp:glib',
-            'chromium-ewk',
           ],
           'conditions': [
             ['use_wayland==0', {

diff --git a/tizen_src/ewk/ubrowser/ubrowser.gypi b/tizen_src/ewk/ubrowser/ubrowser.gypi
index 5f3fdf5..54ca8c9 100644 (file)
--- a/tizen_src/ewk/ubrowser/ubrowser.gypi
+++ b/tizen_src/ewk/ubrowser/ubrowser.gypi
@@ -8,8 +8,8 @@
       '<(DEPTH)/tizen_src/build/system.gyp:ecore',
       '<(DEPTH)/tizen_src/build/system.gyp:ecore-evas',
       '<(DEPTH)/tizen_src/build/system.gyp:elementary',
-      'chromium-ewk',
-      'launch_exec',
+      '<(DEPTH)/tizen_src/ewk/efl_integration/efl_integration.gypi:chromium-ewk',
+      '<(DEPTH)/tizen_src/ewk/efl_integration/efl_integration.gypi:launch_exec',
     ],
     'defines': [
       # Uncomment once uBrowser replaces mini_browser and it's xml

diff --git a/tizen_src/ewk/unittest/ewk-tests.gypi b/tizen_src/ewk/unittest/ewk-tests.gypi
index 1c877af..251f675 100644 (file)
--- a/tizen_src/ewk/unittest/ewk-tests.gypi
+++ b/tizen_src/ewk/unittest/ewk-tests.gypi
@@ -7,9 +7,9 @@
       '<(DEPTH)/tizen_src/build/system.gyp:ecore-x',
       '<(DEPTH)/tizen_src/build/system.gyp:edje',
       '<(DEPTH)/tizen_src/build/system.gyp:elementary',
+      '<(DEPTH)/tizen_src/ewk/efl_integration/efl_integration.gypi:chromium-ewk',
       '<(DEPTH)/testing/gtest.gyp:gtest',
       'bundle_sample',
-      'chromium-ewk',
     ],
     'include_dirs': [
       '../efl_integration/public',