Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / web.gyp

diff --git a/src/third_party/WebKit/Source/web/web.gyp b/src/third_party/WebKit/Source/web/web.gyp
index ec0fefc..a5f0ce8 100644 (file)
--- a/src/third_party/WebKit/Source/web/web.gyp
+++ b/src/third_party/WebKit/Source/web/web.gyp
@@ -63,8 +63,6 @@
                 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
             ],
             'include_dirs': [
-                '../../public/web',
-                '../web',
                 '<(angle_path)/include',
                 '<(DEPTH)/third_party/skia/include/utils',
             ],
@@ -103,11 +101,6 @@
                         '<(DEPTH)/url/url.gyp:url_lib',
                         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
                     ],
-                    'include_dirs': [
-                        # WARNING: Do not view this particular case as a precedent for
-                        # including WebCore headers in DumpRenderTree project.
-                        '../core/testing/v8', # for WebCoreTestSupport.h, needed to link in window.internals code.
-                    ],
                     'sources': [
                         # Compile Blink unittest files into blink_web.dll in component build mode
                         # since there're methods that are tested but not exported.
@@ -153,9 +146,6 @@
                     'dependencies': [
                         '<(DEPTH)/build/linux/system.gyp:fontconfig',
                     ],
-                    'include_dirs': [
-                        '../../public/web/linux',
-                    ],
                 }, {
                     'sources/': [
                         ['exclude', 'linux/'],
@@ -165,40 +155,17 @@
                     'dependencies': [
                         '<(DEPTH)/build/linux/system.gyp:x11',
                     ],
-                    'include_dirs': [
-                        '../../public/web/x11',
-                    ],
                 }, {
                     'sources/': [
                         ['exclude', 'x11/'],
                     ]
                 }],
-                ['toolkit_uses_gtk == 1', {
-                    'dependencies': [
-                        '<(DEPTH)/build/linux/system.gyp:gtk',
-                    ],
-                    'include_dirs': [
-                        '../../public/web/gtk',
-                    ],
-                }, { # else: toolkit_uses_gtk != 1
-                    'sources/': [
-                        ['exclude', 'WebInputEventFactoryGtk.cpp$'],
-                    ],
-                }],
-                ['OS=="android"', {
-                    'include_dirs': [
-                        '../../public/web/android',
-                        '../../public/web/linux', # We need linux/WebFontRendering.h on Android.
-                    ],
-                }, { # else: OS!="android"
+                ['OS!="android"', {
                     'sources/': [
                         ['exclude', 'WebInputEventFactoryAndroid.cpp$'],
                     ],
                 }],
                 ['OS=="mac"', {
-                    'include_dirs': [
-                        '../../public/web/mac',
-                    ],
                     'link_settings': {
                         'libraries': [
                             '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
@@ -211,20 +178,12 @@
                         ['exclude', 'mac/WebScrollbarTheme.cpp$'],
                     ],
                 }],
-                ['OS=="win"', {
-                    'include_dirs': [
-                        '../../public/web/win',
-                    ],
-                }, { # else: OS!="win"
+                ['OS!="win"', {
                     'sources/': [
                         ['exclude', 'WebInputEventFactoryWin.cpp$'],
                     ],
                 }],
-                ['use_default_render_theme==1', {
-                    'include_dirs': [
-                        '../../public/web/default',
-                    ],
-                }, { # else use_default_render_theme==0
+                ['use_default_render_theme==0', {
                     'sources/': [
                         ['exclude', 'default/WebRenderTheme.cpp'],
                     ],
@@ -338,8 +297,6 @@
                         '<(DEPTH)/skia/skia.gyp:skia',
                     ],
                     'include_dirs': [
-                        '../../public/web',
-                        '../core/testing/v8', # for WebCoreTestSupport.h, needed to link in window.internals code.
                         '../../',
                     ],
                     'sources': [