diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-31 22:28:59 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-31 22:28:59 +0000 |
| commit | e9606f42556a1dedefdf4f23fe080d952134ad6b (patch) | |
| tree | fa6e297227086dfaa44adbd235bf63b269bdfb25 /webkit | |
| parent | 5299356524f2e169ec97db351c44fe6da701984e (diff) | |
| download | chromium_src-e9606f42556a1dedefdf4f23fe080d952134ad6b.zip chromium_src-e9606f42556a1dedefdf4f23fe080d952134ad6b.tar.gz chromium_src-e9606f42556a1dedefdf4f23fe080d952134ad6b.tar.bz2 | |
Get rid of GOOGLE_WEBKIT_WITHOUT_GLUE_DEPENDENCY. This was a temporary
bootstrapping shim that is no longer needed, and is in fact no longer used
by anything.
Review URL: http://codereview.chromium.org/8788
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4336 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/build/WebCore/SConscript | 6 | ||||
| -rw-r--r-- | webkit/webkit.xcodeproj/project.pbxproj | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index 032ce63..423fee5 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -25,12 +25,6 @@ if env['PLATFORM'] == 'win32': ) if env['PLATFORM'] in ('darwin', 'posix'): - env.Append( - # HTMLInputElement.cpp has a dependency on glue (see bug 1076026) - CPPDEFINES = [ - 'GOOGLE_WEBKIT_WITHOUT_GLUE_DEPENDENCY', - ] - ) if '-Wall' in env['CXXFLAGS'] and '-Werror' in env['CXXFLAGS']: # It'd be nice to fix these warnings upstream, but we're not going to # block on it. diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj index 5e16012..5c156fc 100644 --- a/webkit/webkit.xcodeproj/project.pbxproj +++ b/webkit/webkit.xcodeproj/project.pbxproj @@ -9271,7 +9271,7 @@ DIR_V8 = "$(XCODEPROJ_DEPTH)/v8"; DIR_WEBCORE = "$(DIR_WEBKIT)/WebCore"; DIR_WEBKIT = "$(DIR_THIRD_PARTY)/WebKit"; - FEATURE_DEFINES = "ENABLE_DATABASE=0 ENABLE_DASHBOARD_SUPPORT=0 ENABLE_JAVASCRIPT_DEBUGGER=0 ENABLE_JSC_MULTIPLE_THREADS=0 ENABLE_ICONDATABASE=0 ENABLE_XSLT=1 ENABLE_XPATH=1 ENABLE_SVG=1 ENABLE_SVG_ANIMATION=1 ENABLE_SVG_AS_IMAGE=1 ENABLE_SVG_USE=1 ENABLE_SVG_FOREIGN_OBJECT=1 ENABLE_SVG_FONTS=1 WEBCORE_NAVIGATOR_PLATFORM_=\"FixMeAndRemoveTrailingUnderscore\" USE_GOOGLE_URL_LIBRARY USE_SYSTEM_MALLOC=1 GOOGLE_WEBKIT_WITHOUT_GLUE_DEPENDENCY=1 HAVE_ACCESSIBILITY=0"; + FEATURE_DEFINES = "ENABLE_DATABASE=0 ENABLE_DASHBOARD_SUPPORT=0 ENABLE_JAVASCRIPT_DEBUGGER=0 ENABLE_JSC_MULTIPLE_THREADS=0 ENABLE_ICONDATABASE=0 ENABLE_XSLT=1 ENABLE_XPATH=1 ENABLE_SVG=1 ENABLE_SVG_ANIMATION=1 ENABLE_SVG_AS_IMAGE=1 ENABLE_SVG_USE=1 ENABLE_SVG_FOREIGN_OBJECT=1 ENABLE_SVG_FONTS=1 WEBCORE_NAVIGATOR_PLATFORM_=\"FixMeAndRemoveTrailingUnderscore\" USE_GOOGLE_URL_LIBRARY USE_SYSTEM_MALLOC=1 HAVE_ACCESSIBILITY=0"; FRAMEWORK_SEARCH_PATHS = ( "$(FRAMEWORK_SEARCH_PATHS)", "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks", @@ -9398,7 +9398,7 @@ DIR_V8 = "$(XCODEPROJ_DEPTH)/v8"; DIR_WEBCORE = "$(DIR_WEBKIT)/WebCore"; DIR_WEBKIT = "$(DIR_THIRD_PARTY)/WebKit"; - FEATURE_DEFINES = "ENABLE_DATABASE=0 ENABLE_DASHBOARD_SUPPORT=0 ENABLE_JAVASCRIPT_DEBUGGER=0 ENABLE_JSC_MULTIPLE_THREADS=0 ENABLE_ICONDATABASE=0 ENABLE_XSLT=1 ENABLE_XPATH=1 ENABLE_SVG=1 ENABLE_SVG_ANIMATION=1 ENABLE_SVG_AS_IMAGE=1 ENABLE_SVG_USE=1 ENABLE_SVG_FOREIGN_OBJECT=1 ENABLE_SVG_FONTS=1 WEBCORE_NAVIGATOR_PLATFORM_=\"FixMeAndRemoveTrailingUnderscore\" USE_GOOGLE_URL_LIBRARY USE_SYSTEM_MALLOC=1 GOOGLE_WEBKIT_WITHOUT_GLUE_DEPENDENCY=1 HAVE_ACCESSIBILITY=0"; + FEATURE_DEFINES = "ENABLE_DATABASE=0 ENABLE_DASHBOARD_SUPPORT=0 ENABLE_JAVASCRIPT_DEBUGGER=0 ENABLE_JSC_MULTIPLE_THREADS=0 ENABLE_ICONDATABASE=0 ENABLE_XSLT=1 ENABLE_XPATH=1 ENABLE_SVG=1 ENABLE_SVG_ANIMATION=1 ENABLE_SVG_AS_IMAGE=1 ENABLE_SVG_USE=1 ENABLE_SVG_FOREIGN_OBJECT=1 ENABLE_SVG_FONTS=1 WEBCORE_NAVIGATOR_PLATFORM_=\"FixMeAndRemoveTrailingUnderscore\" USE_GOOGLE_URL_LIBRARY USE_SYSTEM_MALLOC=1 HAVE_ACCESSIBILITY=0"; FRAMEWORK_SEARCH_PATHS = ( "$(FRAMEWORK_SEARCH_PATHS)", "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks", |