diff options
| -rw-r--r-- | content/content_shell.gypi | 5 | ||||
| -rw-r--r-- | webkit/extensions/webkit_extensions_export.h | 4 | ||||
| -rw-r--r-- | webkit/forms/webkit_forms_export.h | 4 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.gypi | 2 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue_export.h | 4 | ||||
| -rw-r--r-- | webkit/plugins/webkit_plugins_export.h | 4 |
6 files changed, 14 insertions, 9 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 11153f5..997958e 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -188,6 +188,11 @@ '../sandbox/sandbox.gyp:sandbox', ], }], + ['toolkit_uses_gtk == 1', { + 'dependencies': [ + '<(DEPTH)/build/linux/system.gyp:gtk', + ], + }], ], }, ], diff --git a/webkit/extensions/webkit_extensions_export.h b/webkit/extensions/webkit_extensions_export.h index d48c4ef..f1fff8e 100644 --- a/webkit/extensions/webkit_extensions_export.h +++ b/webkit/extensions/webkit_extensions_export.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -6,7 +6,7 @@ #define WEBKIT_EXTENSIONS_WEBKIT_EXTENSIONS_EXPORT_H_ #pragma once -#if 0 // defined(COMPONENT_BUILD) +#if defined(COMPONENT_BUILD) #if defined(WIN32) #if defined(WEBKIT_EXTENSIONS_IMPLEMENTATION) diff --git a/webkit/forms/webkit_forms_export.h b/webkit/forms/webkit_forms_export.h index 92002fa..5a414dc 100644 --- a/webkit/forms/webkit_forms_export.h +++ b/webkit/forms/webkit_forms_export.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -6,7 +6,7 @@ #define WEBKIT_FORMS_WEBKIT_FORMS_EXPORT_H_ #pragma once -#if 0 // defined(COMPONENT_BUILD) +#if defined(COMPONENT_BUILD) #if defined(WIN32) #if defined(WEBKIT_FORMS_IMPLEMENTATION) diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index b0fa6ab..06119bf 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -106,7 +106,7 @@ }, { 'target_name': 'glue', - 'type': 'static_library', + 'type': '<(component)', 'variables': { 'enable_wexit_time_destructors': 1, }, 'defines': [ 'WEBKIT_EXTENSIONS_IMPLEMENTATION', diff --git a/webkit/glue/webkit_glue_export.h b/webkit/glue/webkit_glue_export.h index 8dfccad..337a20c 100644 --- a/webkit/glue/webkit_glue_export.h +++ b/webkit/glue/webkit_glue_export.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -6,7 +6,7 @@ #define WEBKIT_GLUE_WEBKIT_GLUE_EXPORT_H_ #pragma once -#if 0 // defined(COMPONENT_BUILD) +#if defined(COMPONENT_BUILD) #if defined(WIN32) #if defined(WEBKIT_GLUE_IMPLEMENTATION) diff --git a/webkit/plugins/webkit_plugins_export.h b/webkit/plugins/webkit_plugins_export.h index 1f4bef9..78e8638 100644 --- a/webkit/plugins/webkit_plugins_export.h +++ b/webkit/plugins/webkit_plugins_export.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -6,7 +6,7 @@ #define WEBKIT_PLUGINS_WEBKIT_PLUGINS_EXPORT_H_ #pragma once -#if 0 // defined(COMPONENT_BUILD) +#if defined(COMPONENT_BUILD) #if defined(WIN32) #if defined(WEBKIT_PLUGINS_IMPLEMENTATION) |