diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-16 02:16:02 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-16 02:16:02 +0000 |
| commit | 09fc81c6c6231bd49e65615d4f2181cf38a855ef (patch) | |
| tree | 45f21446acb7f3585edb19ab482a3b00408e5eaf /webkit | |
| parent | 31bfae7928aed4a5d350ca2ea7acfd7d258a9eb3 (diff) | |
| download | chromium_src-09fc81c6c6231bd49e65615d4f2181cf38a855ef.zip chromium_src-09fc81c6c6231bd49e65615d4f2181cf38a855ef.tar.gz chromium_src-09fc81c6c6231bd49e65615d4f2181cf38a855ef.tar.bz2 | |
disable building glue as a component for now.
building glue as a component caused us to link in multiple copies of
gles2_c_lib, causing crashes in
platform/chromium/compositing/accelerated-drawing layout tests.
TBR=alokp@chromium.org, darin@chromium.org
BUG=107735
Review URL: http://codereview.chromium.org/8970005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114748 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/extensions/webkit_extensions_export.h | 2 | ||||
| -rw-r--r-- | webkit/forms/webkit_forms_export.h | 2 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.gypi | 2 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue_export.h | 2 | ||||
| -rw-r--r-- | webkit/plugins/webkit_plugins_export.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/webkit/extensions/webkit_extensions_export.h b/webkit/extensions/webkit_extensions_export.h index f560907..d48c4ef 100644 --- a/webkit/extensions/webkit_extensions_export.h +++ b/webkit/extensions/webkit_extensions_export.h @@ -6,7 +6,7 @@ #define WEBKIT_EXTENSIONS_WEBKIT_EXTENSIONS_EXPORT_H_ #pragma once -#if defined(COMPONENT_BUILD) +#if 0 // 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 d3cbe8f..92002fa 100644 --- a/webkit/forms/webkit_forms_export.h +++ b/webkit/forms/webkit_forms_export.h @@ -6,7 +6,7 @@ #define WEBKIT_FORMS_WEBKIT_FORMS_EXPORT_H_ #pragma once -#if defined(COMPONENT_BUILD) +#if 0 // 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 c2bbf38..598dd88 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -106,7 +106,7 @@ }, { 'target_name': 'glue', - 'type': '<(component)', + 'type': 'static_library', '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 1a72fc2..8dfccad 100644 --- a/webkit/glue/webkit_glue_export.h +++ b/webkit/glue/webkit_glue_export.h @@ -6,7 +6,7 @@ #define WEBKIT_GLUE_WEBKIT_GLUE_EXPORT_H_ #pragma once -#if defined(COMPONENT_BUILD) +#if 0 // 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 fce6503..1f4bef9 100644 --- a/webkit/plugins/webkit_plugins_export.h +++ b/webkit/plugins/webkit_plugins_export.h @@ -6,7 +6,7 @@ #define WEBKIT_PLUGINS_WEBKIT_PLUGINS_EXPORT_H_ #pragma once -#if defined(COMPONENT_BUILD) +#if 0 // defined(COMPONENT_BUILD) #if defined(WIN32) #if defined(WEBKIT_PLUGINS_IMPLEMENTATION) |