diff options
| -rw-r--r-- | build/common.gypi | 28 | ||||
| -rw-r--r-- | cc/cc.gyp | 16 | ||||
| -rw-r--r-- | content/browser/devtools/devtools_resources.gyp | 11 | ||||
| -rw-r--r-- | content/content.gyp | 20 | ||||
| -rw-r--r-- | content/content_browser.gypi | 2 | ||||
| -rw-r--r-- | content/content_common.gypi | 2 | ||||
| -rw-r--r-- | content/content_renderer.gypi | 4 | ||||
| -rw-r--r-- | content/content_shell.gypi | 6 | ||||
| -rw-r--r-- | content/content_tests.gypi | 10 | ||||
| -rw-r--r-- | content/content_worker.gypi | 2 | ||||
| -rw-r--r-- | net/net.gyp | 2 | ||||
| -rw-r--r-- | ppapi/ppapi_internal.gyp | 14 | ||||
| -rw-r--r-- | ppapi/ppapi_shared.gypi | 9 | ||||
| -rw-r--r-- | skia/skia.gyp | 8 | ||||
| -rw-r--r-- | ui/ui.gyp | 11 | ||||
| -rw-r--r-- | webkit/base/webkit_base.gypi | 9 | ||||
| -rw-r--r-- | webkit/compositor_bindings/compositor_bindings.gyp | 9 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.gypi | 24 | ||||
| -rw-r--r-- | webkit/gpu/webkit_gpu.gyp | 20 | ||||
| -rw-r--r-- | webkit/media/webkit_media.gypi | 12 | ||||
| -rw-r--r-- | webkit/storage/webkit_storage.gypi | 16 | ||||
| -rw-r--r-- | webkit/support/setup_third_party.gyp | 97 | ||||
| -rwxr-xr-x | webkit/support/setup_third_party.py | 129 | ||||
| -rw-r--r-- | webkit/support/webkit_support.gypi | 7 | ||||
| -rw-r--r-- | webkit/user_agent/webkit_user_agent.gypi | 7 |
25 files changed, 47 insertions, 428 deletions
diff --git a/build/common.gypi b/build/common.gypi index 91bb896..1933db4 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -120,11 +120,6 @@ # Sets whether chrome is built for google tv device. 'google_tv%': 0, - # This variable tells WebCore.gyp and JavaScriptCore.gyp whether they - # are built under a chromium full build (1) or a webkit.org chromium - # build (0). - 'inside_chromium_build%': 1, - # Set ARM architecture version. 'arm_version%': 7, @@ -198,7 +193,6 @@ 'enable_touch_ui%': '<(enable_touch_ui)', 'android_webview_build%': '<(android_webview_build)', 'google_tv%': '<(google_tv)', - 'inside_chromium_build%': '<(inside_chromium_build)', 'enable_app_list%': '<(enable_app_list)', 'enable_message_center%': '<(enable_message_center)', 'use_default_render_theme%': '<(use_default_render_theme)', @@ -669,7 +663,7 @@ # NOTE: The check for disable_nacl==0 and component=="static_library" # can't be used here because these variables are not defined yet, but it # is still not supported. - ['inside_chromium_build==1 and OS!="mac" and OS!="ios" and OS!="android" and chromeos==0', { + ['OS!="mac" and OS!="ios" and OS!="android" and chromeos==0', { 'test_isolation_mode%': 'check', }, { 'test_isolation_mode%': 'noop', @@ -750,7 +744,6 @@ 'use_xi2_mt%':'<(use_xi2_mt)', 'file_manager_extension%': '<(file_manager_extension)', 'image_loader_extension%': '<(image_loader_extension)', - 'inside_chromium_build%': '<(inside_chromium_build)', 'fastbuild%': '<(fastbuild)', 'dcheck_always_on%': '<(dcheck_always_on)', 'python_ver%': '<(python_ver)', @@ -3296,22 +3289,13 @@ ], }], ['linux_use_gold_binary==1', { - 'variables': { - 'conditions': [ - ['inside_chromium_build==1', { - # We pass the path to gold to the compiler. gyp leaves - # unspecified what the cwd is when running the compiler, - # so the normal gyp path-munging fails us. This hack - # gets the right path. - 'gold_path': '<(PRODUCT_DIR)/../../third_party/gold', - }, { - 'gold_path': '<(PRODUCT_DIR)/../../Source/WebKit/chromium/third_party/gold', - }] - ] - }, 'ldflags': [ # Put our gold binary in the search path for the linker. - '-B<(gold_path)', + # We pass the path to gold to the compiler. gyp leaves + # unspecified what the cwd is when running the compiler, + # so the normal gyp path-munging fails us. This hack + # gets the right path. + '-B<(PRODUCT_DIR)/../../third_party/gold', ], }], ], @@ -353,21 +353,7 @@ 'trees/tree_synchronizer.cc', 'trees/tree_synchronizer.h', ], - 'conditions': [ - ['inside_chromium_build==1', { - 'webkit_src_dir': '<(DEPTH)/third_party/WebKit', - }, { - 'webkit_src_dir': '<(DEPTH)/../../..', - }], - ], }, - 'conditions': [ - ['inside_chromium_build==0', { - 'defines': [ - 'INSIDE_WEBKIT_BUILD=1', - ], - }], - ], 'targets': [ { 'target_name': 'cc', @@ -381,7 +367,7 @@ '<(DEPTH)/ui/gl/gl.gyp:gl', '<(DEPTH)/ui/surface/surface.gyp:surface', '<(DEPTH)/ui/ui.gyp:ui', - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', + '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', ], 'defines': [ 'CC_IMPLEMENTATION=1', diff --git a/content/browser/devtools/devtools_resources.gyp b/content/browser/devtools/devtools_resources.gyp index 39c09ae..19b114c 100644 --- a/content/browser/devtools/devtools_resources.gyp +++ b/content/browser/devtools/devtools_resources.gyp @@ -3,21 +3,12 @@ # found in the LICENSE file. { - 'variables': { - 'conditions': [ - ['inside_chromium_build==0', { - 'webkit_src_dir': '../../../../../..', - },{ - 'webkit_src_dir': '../../../third_party/WebKit', - }], - ], - }, 'targets': [ { 'target_name': 'devtools_resources', 'type': 'none', 'dependencies': [ - '<(webkit_src_dir)/Source/devtools/devtools.gyp:generate_devtools_grd', + '../../../third_party/WebKit/Source/devtools/devtools.gyp:generate_devtools_grd', ], 'variables': { 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', diff --git a/content/content.gyp b/content/content.gyp index ef4a087..69bc5d0 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -6,22 +6,10 @@ 'variables': { 'chromium_code': 1, # Use higher warning level. 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/directxsdk)', - 'conditions': [ - ['inside_chromium_build==0', { - 'webkit_src_dir': '../../../..', - },{ - 'webkit_src_dir': '../third_party/WebKit', - }], - ], }, 'target_defaults': { 'defines': ['CONTENT_IMPLEMENTATION'], 'conditions': [ - ['inside_chromium_build==0', { - 'dependencies': [ - '../webkit/support/setup_third_party.gyp:third_party_headers', - ], - }], # TODO(jschuh): Remove this after crbug.com/173851 gets fixed. ['OS=="win" and target_arch=="x64"', { 'msvs_settings': { @@ -32,12 +20,10 @@ }], ], }, + 'includes': [ + 'content_tests.gypi', + ], 'conditions': [ - ['inside_chromium_build==1', { - 'includes': [ - 'content_tests.gypi', - ], - }], ['OS != "ios"', { 'includes': [ '../build/win_precompile.gypi', diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 64af9f4..37b5aee 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -1085,7 +1085,7 @@ '../cc/cc.gyp:cc', '../net/net.gyp:http_server', '../printing/printing.gyp:printing', - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', + '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '../ui/surface/surface.gyp:surface', '../webkit/support/webkit_support.gyp:webkit_resources', '../webkit/support/webkit_support.gyp:webkit_storage', diff --git a/content/content_common.gypi b/content/content_common.gypi index 9537c6c..940561b 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -421,8 +421,8 @@ '../gpu/gpu.gyp:gpu_ipc', '../ipc/ipc.gyp:ipc', '../media/media.gyp:shared_memory_support', + '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '../third_party/npapi/npapi.gyp:npapi', - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', '../ui/gl/gl.gyp:gl', '../webkit/support/webkit_support.gyp:glue', '../webkit/support/webkit_support.gyp:webkit_base', diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index 0fb1bdb..cf6cd99 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -7,12 +7,12 @@ '../jingle/jingle.gyp:jingle_glue', '../net/net.gyp:net', '../skia/skia.gyp:skia', + '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '../third_party/hyphen/hyphen.gyp:hyphen', - '../third_party/icu/icu.gyp:icuuc', '../third_party/icu/icu.gyp:icui18n', + '../third_party/icu/icu.gyp:icuuc', '../third_party/libjingle/libjingle.gyp:libjingle', '../third_party/npapi/npapi.gyp:npapi', - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', '../ui/native_theme/native_theme.gyp:native_theme', '../ui/surface/surface.gyp:surface', '../v8/tools/gyp/v8.gyp:v8', diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 2919ba3..8d3e868 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -47,14 +47,14 @@ '../net/net.gyp:net', '../net/net.gyp:net_resources', '../skia/skia.gyp:skia', + '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', + '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit_test_support', + '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:TestRunner', '../ui/gl/gl.gyp:gl', '../ui/ui.gyp:ui', '../v8/tools/gyp/v8.gyp:v8', '../webkit/support/webkit_support.gyp:webkit_resources', '../webkit/support/webkit_support.gyp:webkit_support', - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit_test_support', - '<(webkit_src_dir)/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:TestRunner', ], 'include_dirs': [ '..', diff --git a/content/content_tests.gypi b/content/content_tests.gypi index c4db3aa..ca73b44 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -168,8 +168,8 @@ '../ppapi/ppapi_internal.gyp:ppapi_proxy', '../ppapi/ppapi_internal.gyp:ppapi_shared', '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared', - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', - '<(webkit_src_dir)/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:TestRunner', + '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', + '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:TestRunner', '../ui/surface/surface.gyp:surface', '../webkit/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support', '../webkit/gpu/webkit_gpu.gyp:webkit_gpu', @@ -563,11 +563,11 @@ '../ipc/ipc.gyp:test_support_ipc', '../jingle/jingle.gyp:jingle_glue_test_util', '../media/media.gyp:shared_memory_support', + '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '../third_party/libjingle/libjingle.gyp:libjingle', - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', '../ui/gl/gl.gyp:gl', '../v8/tools/gyp/v8.gyp:v8', '../webkit/support/webkit_support.gyp:glue', @@ -717,13 +717,14 @@ '../ipc/ipc.gyp:test_support_ipc', '../net/net.gyp:net_test_support', '../ppapi/ppapi_internal.gyp:ppapi_host', - '../ppapi/ppapi_internal.gyp:ppapi_proxy', '../ppapi/ppapi_internal.gyp:ppapi_ipc', + '../ppapi/ppapi_internal.gyp:ppapi_proxy', '../ppapi/ppapi_internal.gyp:ppapi_shared', '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared', '../skia/skia.gyp:skia', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', + '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:TestRunner_resources', '../third_party/mesa/mesa.gyp:osmesa', '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', '../ui/gl/gl.gyp:gl', @@ -732,7 +733,6 @@ '../ui/ui.gyp:ui', '../webkit/support/webkit_support.gyp:clearkeycdmadapter', '../webkit/support/webkit_support.gyp:glue', - '<(webkit_src_dir)/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:TestRunner_resources', ], 'include_dirs': [ '..', diff --git a/content/content_worker.gypi b/content/content_worker.gypi index a5f6766..9ecda78 100644 --- a/content/content_worker.gypi +++ b/content/content_worker.gypi @@ -6,7 +6,7 @@ 'dependencies': [ '../base/base.gyp:base', '../skia/skia.gyp:skia', - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', + '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', ], 'sources': [ 'worker/shared_worker_devtools_agent.cc', diff --git a/net/net.gyp b/net/net.gyp index 10d7d3b..1fef42c 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -2167,7 +2167,7 @@ 'url_request/url_request_test_util.h', ], 'conditions': [ - ['inside_chromium_build==1 and OS != "ios"', { + ['OS != "ios"', { 'dependencies': [ '../third_party/protobuf/protobuf.gyp:py_proto', ], diff --git a/ppapi/ppapi_internal.gyp b/ppapi/ppapi_internal.gyp index 6d75638..fd82adc 100644 --- a/ppapi/ppapi_internal.gyp +++ b/ppapi/ppapi_internal.gyp @@ -52,14 +52,14 @@ '../gpu/gpu.gyp:gles2_implementation', '../media/media.gyp:shared_memory_support', '../skia/skia.gyp:skia', - '../third_party/icu/icu.gyp:icuuc', # TODO(ananta) : The WebKit dependency needs to move to a new target for NACL. - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', + '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', + '../third_party/icu/icu.gyp:icuuc', '../ui/surface/surface.gyp:surface', ], 'export_dependent_settings': [ '../base/base.gyp:base', - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', + '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', ], 'conditions': [ ['OS=="mac"', { @@ -112,10 +112,10 @@ '../media/media.gyp:shared_memory_support', '../ipc/ipc.gyp:ipc', '../skia/skia.gyp:skia', + # TODO(ananta) : The WebKit dependency needs to move to a new target for NACL. + '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '../third_party/icu/icu.gyp:icuuc', '../third_party/icu/icu.gyp:icui18n', - # TODO(ananta) : The WebKit dependency needs to move to a new target for NACL. - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', '../ui/surface/surface.gyp:surface', 'ppapi.gyp:ppapi_c', 'ppapi_shared', @@ -151,10 +151,10 @@ '../media/media.gyp:shared_memory_support', '../ipc/ipc.gyp:ipc', '../skia/skia.gyp:skia', + # TODO(ananta) : The WebKit dependency needs to move to a new target for NACL. + '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '../third_party/icu/icu.gyp:icuuc', '../third_party/icu/icu.gyp:icui18n', - # TODO(ananta) : The WebKit dependency needs to move to a new target for NACL. - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', '../ui/surface/surface.gyp:surface', 'ppapi.gyp:ppapi_c', 'ppapi_shared', diff --git a/ppapi/ppapi_shared.gypi b/ppapi/ppapi_shared.gypi index 3bba9c6..0d2e478 100644 --- a/ppapi/ppapi_shared.gypi +++ b/ppapi/ppapi_shared.gypi @@ -3,15 +3,6 @@ # found in the LICENSE file. { - 'variables': { - 'conditions': [ - ['inside_chromium_build==0', { - 'webkit_src_dir': '../../../..', - },{ - 'webkit_src_dir': '../third_party/WebKit', - }], - ], - }, 'target_defaults': { 'variables': { 'ppapi_shared_target': 0, diff --git a/skia/skia.gyp b/skia/skia.gyp index 63ab069..117cbc4 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -14,12 +14,6 @@ }, { 'skia_support_gpu': 1, }], - - ['inside_chromium_build==0', { - 'webkit_src_dir': '<(DEPTH)/../../..', - },{ - 'webkit_src_dir': '<(DEPTH)/third_party/WebKit', - }], ], 'optimize': 'max', @@ -334,7 +328,7 @@ ['exclude', '_ios\\.(cc|cpp|mm?)$'], ], 'dependencies': [ - '<(webkit_src_dir)/Source/WebKit/chromium/skia_webkit.gyp:skia_webkit', + '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/skia_webkit.gyp:skia_webkit', ], }], [ 'OS != "mac"', { @@ -9,6 +9,7 @@ 'includes': [ 'shell_dialogs.gypi', 'ui_resources.gypi', + 'ui_unittests.gypi', ], 'targets': [ { @@ -878,11 +879,6 @@ '-ldl', ], }], - ['inside_chromium_build==0', { - 'dependencies': [ - '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', - ], - }], ['use_system_icu==1', { # When using the system icu, the icu targets generate shim headers # which are included by public headers in the ui target, so we need @@ -893,11 +889,6 @@ }, ], 'conditions': [ - ['inside_chromium_build == 1', { - 'includes': [ - 'ui_unittests.gypi', - ]}, - ], ['OS=="android"' , { 'targets': [ { diff --git a/webkit/base/webkit_base.gypi b/webkit/base/webkit_base.gypi index c0c43a3..49817e0 100644 --- a/webkit/base/webkit_base.gypi +++ b/webkit/base/webkit_base.gypi @@ -12,7 +12,7 @@ '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', '<(DEPTH)/net/net.gyp:net', - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', + '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', ], 'defines': ['WEBKIT_BASE_IMPLEMENTATION'], 'sources': [ @@ -22,13 +22,6 @@ 'file_path_string_conversions.h', 'webkit_base_export.h', ], - 'conditions': [ - ['inside_chromium_build==0', { - 'dependencies': [ - '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', - ], - }], - ], }, ], } diff --git a/webkit/compositor_bindings/compositor_bindings.gyp b/webkit/compositor_bindings/compositor_bindings.gyp index 728fd32..3ff6fe5 100644 --- a/webkit/compositor_bindings/compositor_bindings.gyp +++ b/webkit/compositor_bindings/compositor_bindings.gyp @@ -37,13 +37,6 @@ 'web_transform_animation_curve_impl.cc', 'web_transform_animation_curve_impl.h', ], - 'conditions': [ - ['inside_chromium_build==0', { - 'webkit_src_dir': '../../../../..', - },{ - 'webkit_src_dir': '../../third_party/WebKit', - }], - ], }, 'targets': [ { @@ -72,9 +65,9 @@ '../../gpu/gpu.gyp:gpu', '../../media/media.gyp:media', '../../skia/skia.gyp:skia', + '../../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '../../ui/ui.gyp:ui', '../../webkit/gpu/webkit_gpu.gyp:webkit_gpu', - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', ], 'sources': [ '<@(webkit_compositor_bindings_sources)', diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index 8ab406d..e2aebcf 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -3,15 +3,6 @@ # found in the LICENSE file. { - 'variables': { - 'conditions': [ - ['inside_chromium_build==0', { - 'webkit_src_dir': '../../../../..', - },{ - 'webkit_src_dir': '../../third_party/WebKit', - }], - ], - }, 'target_defaults': { # Disable narrowing-conversion-in-initialization-list warnings in that we # do not want to fix it in data file "webcursor_gtk_data.h". @@ -36,7 +27,7 @@ { 'action_name': 'webkit_chromium_resources', 'variables': { - 'grit_grd_file': '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.grd', + 'grit_grd_file': '../../third_party/WebKit/Source/WebKit/chromium/WebKit.grd', }, 'includes': [ '../../build/grit_action.gypi' ], }, @@ -86,6 +77,7 @@ '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared', '<(DEPTH)/printing/printing.gyp:printing', '<(DEPTH)/skia/skia.gyp:skia', + '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '<(DEPTH)/third_party/icu/icu.gyp:icui18n', '<(DEPTH)/third_party/icu/icu.gyp:icuuc', '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', @@ -95,7 +87,6 @@ '<(DEPTH)/ui/ui.gyp:ui_resources', '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', '<(DEPTH)/webkit/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support', - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 'user_agent', 'webkit_base', 'webkit_media', @@ -452,22 +443,17 @@ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4800, 4267 ], 'conditions': [ - ['inside_chromium_build==1 and component=="shared_library"', { + ['component=="shared_library"', { 'dependencies': [ - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', + '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', ], 'export_dependent_settings': [ - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', + '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', ], }], ], }], - ['inside_chromium_build==0', { - 'dependencies': [ - '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', - ], - }], ['OS=="android"', { 'dependencies': [ 'overscroller_jni_headers', diff --git a/webkit/gpu/webkit_gpu.gyp b/webkit/gpu/webkit_gpu.gyp index 5db1fa7..9d40d8c 100644 --- a/webkit/gpu/webkit_gpu.gyp +++ b/webkit/gpu/webkit_gpu.gyp @@ -8,15 +8,6 @@ # webkit/ should be removed, at which point this condition can be # removed. ['OS != "ios"', { - 'variables': { - 'conditions': [ - ['inside_chromium_build==0', { - 'webkit_src_dir': '../../../../..', - },{ - 'webkit_src_dir': '../../third_party/WebKit', - }], - ], - }, 'targets': [ { 'target_name': 'webkit_gpu', @@ -26,15 +17,15 @@ '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '<(DEPTH)/gpu/command_buffer/command_buffer.gyp:gles2_utils', - '<(DEPTH)/gpu/gpu.gyp:command_buffer_service', '<(DEPTH)/gpu/gpu.gyp:command_buffer_client', + '<(DEPTH)/gpu/gpu.gyp:command_buffer_service', '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', '<(DEPTH)/gpu/gpu.gyp:gles2_implementation', '<(DEPTH)/skia/skia.gyp:skia', + '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '<(DEPTH)/third_party/angle/src/build_angle.gyp:translator_glsl', '<(DEPTH)/ui/gl/gl.gyp:gl', '<(DEPTH)/ui/ui.gyp:ui', - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', ], 'sources': [ # This list contains all .h and .cc in gpu except for test code. @@ -51,13 +42,6 @@ 'webgraphicscontext3d_in_process_impl.cc', 'webgraphicscontext3d_in_process_impl.h', ], - 'conditions': [ - ['inside_chromium_build==0', { - 'dependencies': [ - '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', - ], - }], - ], 'defines': [ 'WEBKIT_GPU_IMPLEMENTATION', ], diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi index ce3ab16..4cbe866 100644 --- a/webkit/media/webkit_media.gypi +++ b/webkit/media/webkit_media.gypi @@ -5,11 +5,6 @@ { 'variables': { 'conditions': [ - ['inside_chromium_build==0', { - 'webkit_src_dir': '../../../../..', - },{ - 'webkit_src_dir': '../../third_party/WebKit', - }], ['OS == "android" or OS == "ios"', { # Android and iOS don't use ffmpeg. 'use_ffmpeg%': 0, @@ -39,9 +34,9 @@ '<(DEPTH)/media/media.gyp:shared_memory_support', '<(DEPTH)/media/media.gyp:yuv_convert', '<(DEPTH)/skia/skia.gyp:skia', + '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', '<(DEPTH)/webkit/compositor_bindings/compositor_bindings.gyp:webkit_compositor_bindings', - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', ], 'sources': [ 'android/audio_decoder_android.cc', @@ -97,11 +92,6 @@ 'websourcebuffer_impl.h', ], 'conditions': [ - ['inside_chromium_build == 0', { - 'dependencies': [ - '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', - ], - }], ['OS == "android"', { 'sources!': [ 'audio_decoder.cc', diff --git a/webkit/storage/webkit_storage.gypi b/webkit/storage/webkit_storage.gypi index f39de1d..a84192c 100644 --- a/webkit/storage/webkit_storage.gypi +++ b/webkit/storage/webkit_storage.gypi @@ -3,15 +3,6 @@ # found in the LICENSE file. { - 'variables': { - 'conditions': [ - ['inside_chromium_build==0', { - 'webkit_src_dir': '../../../../..', - },{ - 'webkit_src_dir': '../../third_party/WebKit', - }], - ], - }, 'includes': [ '../appcache/webkit_appcache.gypi', '../blob/webkit_blob.gypi', @@ -32,10 +23,10 @@ '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', '<(DEPTH)/net/net.gyp:net', '<(DEPTH)/sql/sql.gyp:sql', + '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base', - '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', ], 'defines': ['WEBKIT_STORAGE_IMPLEMENTATION'], 'sources': [ @@ -48,11 +39,6 @@ '<@(webkit_quota_sources)', ], 'conditions': [ - ['inside_chromium_build==0', { - 'dependencies': [ - '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', - ], - }], ['chromeos==1', { 'sources': [ '<@(webkit_fileapi_chromeos_sources)', diff --git a/webkit/support/setup_third_party.gyp b/webkit/support/setup_third_party.gyp deleted file mode 100644 index bda14c2..0000000 --- a/webkit/support/setup_third_party.gyp +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright (c) 2012 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'variables': { - 'setup_third_party_cmd': ['python', 'setup_third_party.py'], - 'webkit_client_api_dest': '<(SHARED_INTERMEDIATE_DIR)/webkit/third_party/WebKit/Source/WebKit/chromium/public', - 'platform_api_dest': '<(SHARED_INTERMEDIATE_DIR)/webkit/third_party/WebKit/Source/Platform/chromium/public', - 'mac_webcoresupport_dest': '<(SHARED_INTERMEDIATE_DIR)/webkit/third_party/WebKit/Source/WebKit/mac/WebCoreSupport', - }, - 'targets': [ - { - # This target is only invoked when we are building chromium inside - # of a WebKit checkout. In this case, we will have chromium files - # that include WebKit headers via third_party/WebKit/Source/... ; - # that directory doesn't exist in a chromium-inside-webkit - # checkout, and so we need to create sets of forwarding headers. - # - # In addition, we can hit limits on the include paths on windows - # with a regular forwarding header due to the deep directory - # hierarchies, and so rather than using #includes that are relative - # to the directory containing the generated header, the generated files - # use #includes that are relative to <(DEPTH). - 'target_name': 'third_party_headers', - 'type': 'none', - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/webkit', - '<(DEPTH)', - ], - }, - 'actions': [ - { - 'action_name': 'third_party_webkit_client_api_forwarding_headers', - 'inputs': [ - '<!@(<(setup_third_party_cmd) inputs <(DEPTH)/public)', - 'setup_third_party.py', - ], - 'outputs': [ - "<!@(<(setup_third_party_cmd) outputs <(DEPTH)/public '<(webkit_client_api_dest)')", - ], - 'action': [ - '<@(setup_third_party_cmd)', - 'setup_headers', - '<(DEPTH)/public', - '<(webkit_client_api_dest)', - '<(DEPTH)', - ], - 'message': 'Generating forwarding headers for third_party/WebKit/Source/WebKit/chromium/public', - }, - { - 'action_name': 'third_party_platform_api_forwarding_headers', - 'inputs': [ - '<!@(<(setup_third_party_cmd) inputs <(DEPTH)/../../Platform/chromium/public)', - 'setup_third_party.py', - ], - 'outputs': [ - "<!@(<(setup_third_party_cmd) outputs <(DEPTH)/../../Platform/chromium/public '<(platform_api_dest)')", - ], - 'action': [ - '<@(setup_third_party_cmd)', - 'setup_headers', - '<(DEPTH)/../../Platform/chromium/public', - '<(platform_api_dest)', - '<(DEPTH)', - ], - 'message': 'Generating forwarding headers for third_party/WebKit/Source/Platform/chromium/public', - }, - ], - 'conditions': [ - ['OS=="mac"', { - 'actions': [ - { - 'action_name': 'third_party_mac_forwarding_headers', - 'inputs': [ - '<!@(<(setup_third_party_cmd) inputs <(DEPTH)/../mac/WebCoreSupport)', - 'setup_third_party.py', - ], - 'outputs': [ - "<!@(<(setup_third_party_cmd) outputs <(DEPTH)/../mac/WebCoreSupport '<(mac_webcoresupport_dest)')", - ], - 'action': [ - '<@(setup_third_party_cmd)', - 'setup_headers', - '<(DEPTH)/../mac/WebCoreSupport', - '<(mac_webcoresupport_dest)', - '<(DEPTH)', - ], - 'message': 'Generating forwarding headers for third_party/WebKit/Source/WebKit/mac/WebCoreSupport', - }, - ], - }], - ], - }, - ], -} diff --git a/webkit/support/setup_third_party.py b/webkit/support/setup_third_party.py deleted file mode 100755 index 0f4099d..0000000 --- a/webkit/support/setup_third_party.py +++ /dev/null @@ -1,129 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2012 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -"""A helper script for setting up forwarding headers.""" - -import errno -import os -import sys - - -def GetHeaderFilesInDir(dir_path): - """Return a list of all header files under dir_path - (as absolute native paths).""" - all_files = [] - for root, dirs, files in os.walk(dir_path): - all_files.extend([os.path.join(root, f) for f in files if f.endswith('.h')]) - return all_files - - -def PathForInclude(path): - # We should always use unix-style forward slashes in #includes. - return path.replace(os.sep, '/') - - -def NativePath(path): - return path.replace('/', os.sep) - - -def PathForGyp(path): - # GYP will try to shell-escape backslashes, so we should always - # return unix-style paths with forward slashes as the directory separators. - return path.replace(os.sep, '/') - - -def Inputs(args): - """List the files in the provided input dir. - - args: A list with 1 value, the input dir. - Returns: 0 on success, other value on error.""" - if len(args) != 1: - print "'inputs' expects only one input directory." - return -1 - - for filename in GetHeaderFilesInDir(args[0]): - print PathForGyp(filename) - return 0 - - -def Outputs(args): - """Takes an input dir and an output dir and figures out new output files - based on copying from the input dir to the output dir. - - args: A list with 2 values, the input dir and the output dir. - Returns: 0 on success, other value on error.""" - if len(args) != 2: - print "'outputs' expects an input directory and an output directory." - return -1 - - base_input_dir = NativePath(args[0]) - output_dir = NativePath(args[1]) - input_files = GetHeaderFilesInDir(base_input_dir) - for filename in input_files: - rel_path = os.path.relpath(filename, base_input_dir) - print PathForGyp(os.path.join(output_dir, rel_path)) - - -def SetupHeaders(args): - """Takes an input dir and an output dir and sets up forwarding headers - from output dir to files in input dir. - args: A list with 3 values, the input dir, the output dir, and the dir - that #include paths will be relative to.. - Returns: 0 on success, other value on error.""" - if len(args) != 3: - print ("'setup_headers' expects an input directory, an output directory, ." - "and a directory to make includes relative to.") - return -1 - - base_input_dir = NativePath(args[0]) - output_dir = NativePath(args[1]) - relative_to_dir = NativePath(args[2]) - input_files = GetHeaderFilesInDir(base_input_dir) - for input_filename in input_files: - rel_path = os.path.relpath(input_filename, base_input_dir) - out_filename = os.path.join(output_dir, rel_path) - TryToMakeDir(os.path.split(out_filename)[0]) - WriteForwardingHeader(input_filename, out_filename, relative_to_dir) - - -def TryToMakeDir(dir_name): - """Create the directory dir_name if it doesn't exist.""" - try: - os.makedirs(dir_name) - except OSError, e: - if e.errno != errno.EEXIST: - raise e - - -def WriteForwardingHeader(input_filename, out_filename, relative_to_dir): - """Create a forwarding header from out_filename to input_filename.""" - # Windows has a file path limit of 260 characters, which can be hit when - # generating these forwarding headers. Instead of using an include - # that specifies the path relative to out_filename's dir, we compute a path - # relative to relative_to_dir, which must be included in gyp's include_dirs - # settings for this to work. Even those this is really only needed on - # Windows, we do this on all platforms to be consistent. - rel_path = os.path.relpath(input_filename, relative_to_dir) - out_file = open(out_filename, 'w') - out_file.write("""// This file is generated. Do not edit. -// The include is relative to "%s". -#include "%s" -""" % (os.path.abspath(relative_to_dir), PathForInclude(rel_path))) - out_file.close() - - -def Main(argv): - commands = { - 'inputs': Inputs, - 'outputs': Outputs, - 'setup_headers': SetupHeaders, - } - command = argv[1] - args = argv[2:] - return commands[command](args) - - -if __name__ == '__main__': - sys.exit(Main(sys.argv)) diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi index ea784ac..e3c360a 100644 --- a/webkit/support/webkit_support.gypi +++ b/webkit/support/webkit_support.gypi @@ -155,13 +155,6 @@ 'simple_database_system.cc', 'simple_database_system.h', ], - 'conditions': [ - ['inside_chromium_build==0', { - 'dependencies': [ - 'setup_third_party.gyp:third_party_headers', - ], - }], - ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], }, diff --git a/webkit/user_agent/webkit_user_agent.gypi b/webkit/user_agent/webkit_user_agent.gypi index fe5cb98..d7324cb 100644 --- a/webkit/user_agent/webkit_user_agent.gypi +++ b/webkit/user_agent/webkit_user_agent.gypi @@ -3,9 +3,6 @@ # found in the LICENSE file. { - 'variables': { - 'webkit_src_dir': '../../third_party/WebKit/Source', - }, 'targets': [ { 'target_name': 'user_agent', @@ -54,14 +51,14 @@ 'inputs': [ '<(script)', '../../build/util/lastchange.py', # Used by the script. - # This depends on the svn revision of webkit_src_dir but does + # This depends on the svn revision of third_party/WebKit but does # not list it as a dependency. Incremental builds will have # the wrong WEBKIT_SVN_REVISION. ], 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/webkit_version.h', ], - 'action': ['python', '<(script)', '<(webkit_src_dir)', + 'action': ['python', '<(script)', '../../third_party/WebKit/Source', '<(SHARED_INTERMEDIATE_DIR)'], 'variables': { 'script': '../build/webkit_version.py', |