diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/locales/locales.gyp | 2 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 3 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 8 | ||||
| -rw-r--r-- | chrome/chrome_common.gypi | 4 | ||||
| -rw-r--r-- | chrome/chrome_dll.gypi | 2 | ||||
| -rw-r--r-- | chrome/chrome_renderer.gypi | 4 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 4 | ||||
| -rw-r--r-- | chrome/nacl.gypi | 2 | ||||
| -rw-r--r-- | chrome/test/interactive_ui/interactive_ui_tests.gypi | 2 |
9 files changed, 16 insertions, 15 deletions
diff --git a/chrome/app/locales/locales.gyp b/chrome/app/locales/locales.gyp index f6ee029..b3c8a9f 100644 --- a/chrome/app/locales/locales.gyp +++ b/chrome/app/locales/locales.gyp @@ -25,7 +25,7 @@ 'dependencies': [ '../../chrome.gyp:chrome_strings', '../../chrome.gyp:platform_locale_settings', - '../../../webkit/webkit.gyp:webkit_strings', + '../../../webkit/support/webkit_support_in_chromium.gyp:webkit_strings', '../../../app/app.gyp:app_strings', ], 'msvs_settings': { diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index df26731..6283e37 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -478,7 +478,7 @@ '../third_party/libxml/libxml.gyp:libxml', '../third_party/npapi/npapi.gyp:npapi', '../third_party/hunspell/hunspell.gyp:hunspell', - '../webkit/webkit.gyp:glue', + '../webkit/support/webkit_support_in_chromium.gyp:glue', ], 'include_dirs': [ '<(INTERMEDIATE_DIR)', @@ -1334,6 +1334,7 @@ '../third_party/npapi/npapi.gyp:*', '../third_party/sqlite/sqlite.gyp:*', '../third_party/zlib/zlib.gyp:*', + '../webkit/support/webkit_support_in_chromium.gyp:*', '../webkit/webkit.gyp:*', '../build/temp_gyp/googleurl.gyp:*', diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 2252892..d75b354 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -34,10 +34,10 @@ '../third_party/libxml/libxml.gyp:libxml', '../third_party/npapi/npapi.gyp:npapi', '../third_party/hunspell/hunspell.gyp:hunspell', - '../webkit/webkit.gyp:appcache', - '../webkit/webkit.gyp:database', - '../webkit/webkit.gyp:glue', - '../webkit/webkit.gyp:webkit_resources', + '../webkit/support/webkit_support_in_chromium.gyp:appcache', + '../webkit/support/webkit_support_in_chromium.gyp:database', + '../webkit/support/webkit_support_in_chromium.gyp:glue', + '../webkit/support/webkit_support_in_chromium.gyp:webkit_resources', ], 'include_dirs': [ '..', diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 3f45ebe..835c0cb 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -135,8 +135,8 @@ '../third_party/sqlite/sqlite.gyp:sqlite', '../third_party/zlib/zlib.gyp:zlib', '../third_party/npapi/npapi.gyp:npapi', - '../webkit/webkit.gyp:appcache', - '../webkit/webkit.gyp:glue', + '../webkit/support/webkit_support_in_chromium.gyp:appcache', + '../webkit/support/webkit_support_in_chromium.gyp:glue', ], 'sources': [ # .cc, .h, and .mm files under chrome/common that are not required for diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 3a28142..1d55f16 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -86,7 +86,7 @@ '../build/util/support/support.gyp:*', '../third_party/cld/cld.gyp:cld', '../views/views.gyp:views', - '../webkit/webkit.gyp:webkit_resources', + '../webkit/support/webkit_support_in_chromium.gyp:webkit_resources', '../gears/gears.gyp:gears', ], 'sources': [ diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index 1c2520c..37bde8d 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -22,8 +22,8 @@ '../third_party/icu/icu.gyp:icuuc', '../third_party/npapi/npapi.gyp:npapi', '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', - '../webkit/webkit.gyp:glue', - '../webkit/webkit.gyp:webkit_resources', + '../webkit/support/webkit_support_in_chromium.gyp:glue', + '../webkit/support/webkit_support_in_chromium.gyp:webkit_resources', ], 'include_dirs': [ '..', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index f69922c..fd4521a 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -520,7 +520,7 @@ '../net/net.gyp:net_resources', '../net/net.gyp:net_test_support', '../printing/printing.gyp:printing', - '../webkit/webkit.gyp:webkit_resources', + '../webkit/support/webkit_support_in_chromium.gyp:webkit_resources', '../skia/skia.gyp:skia', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', @@ -2060,7 +2060,7 @@ '../base/base.gyp:test_support_perf', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', - '../webkit/webkit.gyp:glue', + '../webkit/support/webkit_support_in_chromium.gyp:glue', ], 'sources': [ 'browser/privacy_blacklist/blacklist_perftest.cc', diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index b8b932d..2d73a123 100644 --- a/chrome/nacl.gypi +++ b/chrome/nacl.gypi @@ -69,7 +69,7 @@ 'chrome_strings', 'common', '../third_party/npapi/npapi.gyp:npapi', - '../webkit/webkit.gyp:glue', + '../webkit/support/webkit_support_in_chromium.gyp:glue', '../native_client/src/trusted/plugin/plugin.gyp:npGoogleNaClPluginChrome', '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel', '../native_client/src/trusted/validator_x86/validator_x86.gyp:ncvalidate', diff --git a/chrome/test/interactive_ui/interactive_ui_tests.gypi b/chrome/test/interactive_ui/interactive_ui_tests.gypi index f003402..1a06415 100644 --- a/chrome/test/interactive_ui/interactive_ui_tests.gypi +++ b/chrome/test/interactive_ui/interactive_ui_tests.gypi @@ -21,7 +21,7 @@ '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', # run time dependency - '<(DEPTH)/webkit/webkit.gyp:webkit_resources', + '<(DEPTH)/webkit/support/webkit_support_in_chromium.gyp:webkit_resources', ], 'include_dirs': [ '<(DEPTH)', |