Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1670)

Unified Diff: Source/web/web.gyp

Issue 99103006: Moving GraphicsContext and dependencies from core to platform. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final patch - fixes Android Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/tests/WebFrameTest.cpp ('k') | Source/web/web.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/web.gyp
diff --git a/Source/web/web.gyp b/Source/web/web.gyp
index 65e6ea84720db37f311cd8e7e7fdf653b30fd629..5d057db5f2067b911756f78e076a4163bf18749a 100644
--- a/Source/web/web.gyp
+++ b/Source/web/web.gyp
@@ -87,7 +87,6 @@
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/third_party/icu/icu.gyp:icuuc',
'<(DEPTH)/third_party/icu/icu.gyp:icui18n',
- '<(libjpeg_gyp_path):libjpeg',
'<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
'<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
'<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
@@ -97,6 +96,7 @@
'<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
'<(DEPTH)/url/url.gyp:url_lib',
'<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
+ '<(libjpeg_gyp_path):libjpeg',
# We must not add webkit_support here because of cyclic dependency.
],
'export_dependent_settings': [
@@ -237,7 +237,6 @@
['OS=="android"', {
'sources/': [
['include', '^linux/WebFontRendering\\.cpp$'],
- ['include', '^linux/WebFontRenderStyle\\.cpp$'],
],
}],
],
« no previous file with comments | « Source/web/tests/WebFrameTest.cpp ('k') | Source/web/web.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698