diff options
author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
tree | f478babb801e720de7bfaee23443ffe029f58731 /Source/WebCore/WebCore.gyp | |
parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
download | external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2 |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/WebCore/WebCore.gyp')
-rw-r--r-- | Source/WebCore/WebCore.gyp/WebCore.gyp | 42 |
1 files changed, 29 insertions, 13 deletions
diff --git a/Source/WebCore/WebCore.gyp/WebCore.gyp b/Source/WebCore/WebCore.gyp/WebCore.gyp index 2cd5169..34066f7 100644 --- a/Source/WebCore/WebCore.gyp/WebCore.gyp +++ b/Source/WebCore/WebCore.gyp/WebCore.gyp @@ -32,7 +32,7 @@ 'includes': [ # FIXME: Sense whether upstream or downstream build, and # include the right features.gypi - '../../../WebKit/chromium/features.gypi', + '../../../Source/WebKit/chromium/features.gypi', '../WebCore.gypi', ], # Location of the chromium src directory. @@ -40,7 +40,7 @@ ['inside_chromium_build==0', { # Webkit is being built outside of the full chromium project. 'variables': { - 'chromium_src_dir': '../../../WebKit/chromium', + 'chromium_src_dir': '../../../Source/WebKit/chromium', 'libjpeg_gyp_path': '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp', }, },{ @@ -333,6 +333,29 @@ ] }, { + 'target_name': 'injected_script_source', + 'type': 'none', + 'actions': [ + { + 'action_name': 'generateInjectedScriptSource', + 'inputs': [ + '../inspector/InjectedScriptSource.js', + ], + 'outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/webkit/InjectedScriptSource.h', + ], + 'action': [ + 'perl', + '../inspector/xxd.pl', + 'InjectedScriptSource_js', + '../inspector/InjectedScriptSource.js', + '<(SHARED_INTERMEDIATE_DIR)/webkit/InjectedScriptSource.h' + ], + 'message': 'Generating InjectedScriptSource.h from InjectedScriptSource.js', + }, + ] + }, + { 'target_name': 'webcore_bindings_sources', 'type': 'none', 'hard_dependency': 1, @@ -723,6 +746,7 @@ 'dependencies': [ 'webcore_bindings_sources', 'inspector_protocol_sources', + 'injected_script_source', '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:pcre', '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf', '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl', @@ -1061,7 +1085,7 @@ '<@(webcore_files)', # For WebCoreSystemInterface, Mac-only. - '../../../WebKit/mac/WebCoreSupport/WebSystemInterface.mm', + '../../../Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm', ], 'sources/': [ # Start by excluding everything then include platform files only. @@ -1177,7 +1201,7 @@ # Use USE_NEW_THEME on Mac. ['include', 'platform/Theme\\.cpp$'], - ['include', 'WebKit/mac/WebCoreSupport/WebSystemInterface\\.mm$'], + ['include', 'Source/WebKit/mac/WebCoreSupport/WebSystemInterface\\.mm$'], # Chromium Mac does not use skia. ['exclude', 'platform/graphics/skia/[^/]*Skia\\.(cpp|h)$'], @@ -1236,11 +1260,6 @@ ['exclude', 'platform/graphics/skia/GlyphPageTreeNodeSkia\\.cpp$'] ], }], - ['"ENABLE_CLIENT_BASED_GEOLOCATION=1" in feature_defines', { - 'sources/': [ - ['exclude', '/GeolocationService.*$'], - ], - }], ['(OS=="linux" or OS=="win") and "WTF_USE_WEBAUDIO_MKL=1" in feature_defines', { 'sources/': [ ['include', 'platform/audio/mkl/FFTFrameMKL\\.cpp$'], @@ -1304,9 +1323,6 @@ # Don't build IDBKeyPathBackendImpl. We have our own implementation. ['exclude', 'storage/IDBKeyPathBackendImpl\\.cpp$'], - # Use history/BackForwardListChromium.cpp instead. - ['exclude', 'history/BackForwardListImpl\\.cpp$'], - # Use loader/icon/IconDatabaseNone.cpp instead. ['exclude', 'loader/icon/IconDatabase\\.cpp$'], @@ -1448,7 +1464,7 @@ 'direct_dependent_settings': { 'include_dirs': [ '../../../WebKitLibraries', - '../../../WebKit/mac/WebCoreSupport', + '../../../Source/WebKit/mac/WebCoreSupport', ], }, }], |