Move exclusions out of supplement.gypi

Patch cleans up supplement.gypi by moving exclusions
related to wayland_bringup to the targets they
belong to.

No functional difference intended.

Bug: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=12490
Reviewed by: Balazs Kelemen, arno renevier

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

diff --git a/tizen_src/chromium_impl/content/content_efl.gypi b/tizen_src/chromium_impl/content/content_efl.gypi
index 9f52228..3d968a5 100644 (file)
--- a/tizen_src/chromium_impl/content/content_efl.gypi
+++ b/tizen_src/chromium_impl/content/content_efl.gypi
@@ -135,6 +135,12 @@
               'common/gpu/media/efl/tizen_video_encode_accelerator.cc',
             ],
           }], # tizen_multimedia_support==1
+          ['wayland_bringup==1', {
+            'sources/': [
+              ['exclude', 'content/common/gpu/client/gpu_memory_buffer_impl_efl_pixmap\\.(h|cc)$'],
+              ['exclude', 'content/common/gpu/gpu_memory_buffer_factory_efl_pixmap\\.(h|cc)$'],
+            ],
+          }], # wayland_bringup
         ],
       }],
 

diff --git a/tizen_src/chromium_impl/ui/ui_efl.gypi b/tizen_src/chromium_impl/ui/ui_efl.gypi
index 11bf29b..eb50d99 100644 (file)
--- a/tizen_src/chromium_impl/ui/ui_efl.gypi
+++ b/tizen_src/chromium_impl/ui/ui_efl.gypi
@@ -66,6 +66,13 @@
         'sources/': [
           [ 'exclude', 'x11_types.cc$' ],
         ],
+        'conditions': [
+          ['wayland_bringup==1', {
+            'sources/': [
+              ['exclude', 'gfx/x11_types_override\\.cc$'],
+            ],
+          }],
+        ],
       }],
 
       ['_target_name=="gl"', {
@@ -87,9 +94,25 @@
               'gl/efl_pixmap.h',
             ],
           }],
+          ['wayland_bringup==1', {
+            'sources/': [
+              ['exclude', 'ui/gl/efl_pixmap\\.(h|cc)$'],
+            ],
+          }],
         ],
       }],
 
+      ['_target_name=="x11_events_platform"', {
+        'conditions': [
+          ['wayland_bringup==1', {
+            'sources/': [
+              ['exclude', 'gfx/x11_event_source_efl\\.(h|cc)$'],
+            ],
+          }],
+        ],
+      }],
+
+
       ['_target_name=="ui_base"', {
         'include_dirs': [
           '<(DEPTH)/third_party/mojo/src/',
@@ -116,6 +139,14 @@
           'base/selection/selection_magnifier_efl.h',
           'base/selection/selection_magnifier_efl.cc',
         ],
+        'conditions': [
+          ['wayland_bringup==1', {
+            'sources/': [
+              ['exclude', 'ui/base/cursor/cursor_loader_x11\\.(h|cc)$'],
+              ['exclude', 'ui/base/cursor/cursor_x11\\.(h|cc)$'],
+            ],
+          }],
+        ],
       }],
 
       ['_target_name=="snapshot"', {

diff --git a/tizen_src/supplement.gypi b/tizen_src/supplement.gypi
index d74f9c2..aff0f18 100644 (file)
--- a/tizen_src/supplement.gypi
+++ b/tizen_src/supplement.gypi
@@ -12,6 +12,7 @@
     'use_efl%' : 1,
 
     'ewk_bringup%': 1,
+    'wayland_bringup%': 0,
 
     'building_for_tizen%': 0,
     'building_for_tizen_mobile%': 0,
@@ -153,35 +154,6 @@
             'defines': [
               'WAYLAND_BRINGUP=1',
             ],
-            'target_conditions': [
-              ['_target_name=="content_common"', {
-                'sources/': [
-                  ['exclude', 'content/common/gpu/client/gpu_memory_buffer_impl_efl_pixmap\\.(h|cc)$'],
-                  ['exclude', 'content/common/gpu/gpu_memory_buffer_factory_efl_pixmap\\.(h|cc)$'],
-                ],
-              }],
-              ['_target_name=="gl"', {
-                'sources/': [
-                  ['exclude', 'ui/gl/efl_pixmap\\.(h|cc)$'],
-                ],
-              }],
-              ['_target_name=="x11_events_platform"', {
-                'sources/': [
-                  ['exclude', 'gfx/x11_event_source_efl\\.(h|cc)$'],
-                ],
-              }],
-              ['_target_name=="gfx_x11"', {
-                'sources/': [
-                  ['exclude', 'gfx/x11_types_override\\.cc$'],
-                ],
-              }],
-              ['_target_name=="ui_base"', {
-                'sources/': [
-                  ['exclude', 'ui/base/cursor/cursor_loader_x11\\.(h|cc)$'],
-                  ['exclude', 'ui/base/cursor/cursor_x11\\.(h|cc)$'],
-                ],
-              }],
-            ],
           }],
         ],
       }],