diff options
-rw-r--r-- | android_webview/native/webview_native.gyp | 2 | ||||
-rw-r--r-- | build/all.gyp | 2 | ||||
-rw-r--r-- | chrome/chrome_browser.gypi | 2 | ||||
-rw-r--r-- | chrome/chrome_browser_chromeos.gypi | 2 | ||||
-rw-r--r-- | chrome/chrome_browser_extensions.gypi | 2 | ||||
-rw-r--r-- | chrome/chrome_browser_ui.gypi | 2 | ||||
-rw-r--r-- | chrome/chrome_common.gypi | 2 | ||||
-rw-r--r-- | chrome_frame/chrome_frame.gyp | 2 | ||||
-rw-r--r-- | content/content_common.gypi | 2 | ||||
-rw-r--r-- | content/content_tests.gypi | 2 | ||||
-rw-r--r-- | webkit/common/user_agent/webkit_user_agent.gyp (renamed from webkit/common/user_agent/webkit_user_agent.gypi) | 5 | ||||
-rw-r--r-- | webkit/glue/webkit_glue.gypi | 2 | ||||
-rw-r--r-- | webkit/plugins/webkit_plugins.gypi | 4 | ||||
-rw-r--r-- | webkit/support/webkit_support.gyp | 3 | ||||
-rw-r--r-- | webkit/support/webkit_support.gypi | 4 |
15 files changed, 19 insertions, 19 deletions
diff --git a/android_webview/native/webview_native.gyp b/android_webview/native/webview_native.gyp index 2ac370d..b0af7e4 100644 --- a/android_webview/native/webview_native.gyp +++ b/android_webview/native/webview_native.gyp @@ -18,7 +18,7 @@ '../../net/net.gyp:net', '../../skia/skia.gyp:skia', '../../ui/ui.gyp:ui', - '../../webkit/support/webkit_support.gyp:user_agent', + '../../webkit/common/user_agent/webkit_user_agent.gyp:user_agent', '../../webkit/support/webkit_support.gyp:webkit_storage', 'android_webview_native_jni', ], diff --git a/build/all.gyp b/build/all.gyp index c8b6530..c3e29e2 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -28,7 +28,6 @@ '../ui/snapshot/snapshot.gyp:*', '../ui/ui.gyp:*', '../url/url.gyp:*', - '../webkit/support/webkit_support.gyp:*', 'temp_gyp/googleurl.gyp:*', ], 'conditions': [ @@ -64,6 +63,7 @@ '../third_party/WebKit/public/all.gyp:*', '../v8/tools/gyp/v8.gyp:*', '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:*', + '../webkit/support/webkit_support.gyp:*', '../webkit/webkit.gyp:*', '<(libjpeg_gyp_path):*', ], diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 19dbd9f..f6a3b1d 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -59,7 +59,7 @@ '../ui/ui.gyp:shell_dialogs', '../ui/ui.gyp:ui', '../ui/ui.gyp:ui_resources', - '../webkit/support/webkit_support.gyp:user_agent', + '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent', ], 'include_dirs': [ '..', diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi index 16be1d6..b82addd 100644 --- a/chrome/chrome_browser_chromeos.gypi +++ b/chrome/chrome_browser_chromeos.gypi @@ -87,8 +87,8 @@ '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', '../v8/tools/gyp/v8.gyp:v8', '../ui/views/controls/webview/webview.gyp:webview', + '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent', '../webkit/support/webkit_support.gyp:glue', - '../webkit/support/webkit_support.gyp:user_agent', '../webkit/support/webkit_support.gyp:webkit_resources', '../webkit/support/webkit_support.gyp:webkit_storage', ], diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi index ab4e4fe3..cbfb8f8 100644 --- a/chrome/chrome_browser_extensions.gypi +++ b/chrome/chrome_browser_extensions.gypi @@ -41,8 +41,8 @@ '../ui/base/strings/ui_strings.gyp:ui_strings', '../ui/ui.gyp:ui', '../ui/ui.gyp:ui_resources', + '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent', '../webkit/support/webkit_support.gyp:glue', - '../webkit/support/webkit_support.gyp:user_agent', '../webkit/support/webkit_support.gyp:webkit_base', '../webkit/support/webkit_support.gyp:webkit_resources', '../webkit/support/webkit_support.gyp:webkit_storage', diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index 493be16..339f868 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -52,7 +52,7 @@ '../ui/snapshot/snapshot.gyp:snapshot', '../ui/ui.gyp:ui', '../ui/ui.gyp:ui_resources', - '../webkit/support/webkit_support.gyp:user_agent', + '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent', ], 'include_dirs': [ '..', diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 28e82db..58c0057 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -48,7 +48,7 @@ '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', '<(DEPTH)/third_party/zlib/zlib.gyp:zip', '<(DEPTH)/ui/ui.gyp:ui_resources', - '<(DEPTH)/webkit/support/webkit_support.gyp:user_agent', + '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent', ], 'sources': [ '../apps/app_shim/app_shim_launch.h', diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index 4136b60..3a805c4 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -690,7 +690,7 @@ '../content/content.gyp:content_common', '../net/net.gyp:net', '../third_party/libxml/libxml.gyp:libxml', - '../webkit/support/webkit_support.gyp:user_agent', + '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent', ], 'sources': [ 'bho.cc', diff --git a/content/content_common.gypi b/content/content_common.gypi index 0075ff6..7c5b2a0 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -13,7 +13,7 @@ '../third_party/icu/icu.gyp:icuuc', '../ui/ui.gyp:shell_dialogs', '../ui/ui.gyp:ui', - '../webkit/support/webkit_support.gyp:user_agent', + '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent', ], 'include_dirs': [ '..', diff --git a/content/content_tests.gypi b/content/content_tests.gypi index ffd5a3b..c7df64e 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -246,7 +246,7 @@ '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../ui/ui.gyp:ui', - '../webkit/support/webkit_support.gyp:user_agent', + '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent', ], 'include_dirs': [ '..', diff --git a/webkit/common/user_agent/webkit_user_agent.gypi b/webkit/common/user_agent/webkit_user_agent.gyp index 3065825..f94fe19 100644 --- a/webkit/common/user_agent/webkit_user_agent.gypi +++ b/webkit/common/user_agent/webkit_user_agent.gyp @@ -1,4 +1,4 @@ -# Copyright 2012 The Chromium Authors. All rights reserved. +# Copyright 2013 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. @@ -10,6 +10,9 @@ 'defines': [ 'WEBKIT_USER_AGENT_IMPLEMENTATION', ], + 'variables': { + 'chromium_code': 1, + }, 'dependencies': [ '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/base.gyp:base_i18n', diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index f70f540..cce64c3 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -182,10 +182,10 @@ '<(DEPTH)/ui/ui.gyp:ui_resources', '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support', + '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent', 'glue_common', 'plugins_common', 'plugins', - 'user_agent', 'webkit_base', 'webkit_common', 'webkit_media', diff --git a/webkit/plugins/webkit_plugins.gypi b/webkit/plugins/webkit_plugins.gypi index b97f7f3..cf17901 100644 --- a/webkit/plugins/webkit_plugins.gypi +++ b/webkit/plugins/webkit_plugins.gypi @@ -101,11 +101,11 @@ '<(DEPTH)/ui/ui.gyp:ui', '<(DEPTH)/ui/ui.gyp:ui_resources', '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', - '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support', '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', + '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent', + '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support', 'glue_common', 'plugins_common', - 'user_agent', 'webkit_base', 'webkit_common', 'webkit_storage', diff --git a/webkit/support/webkit_support.gyp b/webkit/support/webkit_support.gyp index e2af7b4..4a0a942 100644 --- a/webkit/support/webkit_support.gyp +++ b/webkit/support/webkit_support.gyp @@ -3,9 +3,6 @@ # found in the LICENSE file. { - 'includes': [ - '../common/user_agent/webkit_user_agent.gypi', - ], 'conditions': [ # TODO(stuartmorgan): All dependencies from code built on iOS to # webkit/ should be removed, at which point this condition can be diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi index fbaaddf8..a3c1f5a 100644 --- a/webkit/support/webkit_support.gypi +++ b/webkit/support/webkit_support.gypi @@ -24,13 +24,13 @@ '<(DEPTH)/ui/ui.gyp:shell_dialogs', '<(DEPTH)/ui/ui.gyp:ui', '<(DEPTH)/webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', + '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent', '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_bindings', '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support', 'glue', 'glue_common', 'plugins', 'plugins_common', - 'user_agent', 'webkit_base', 'webkit_common', 'webkit_media', @@ -116,8 +116,8 @@ '<(DEPTH)/third_party/hyphen/hyphen.gyp:hyphen', '<(DEPTH)/third_party/zlib/zlib.gyp:zlib', '<(DEPTH)/ui/ui.gyp:ui', + '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent', 'glue', - 'user_agent', 'webkit_support_gfx', ], 'export_dependent_settings': [ |