From a8b12a630f8cf8fca890f4fd3181f9575ee4fa5d Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Wed, 1 Aug 2012 21:06:13 +0000 Subject: Revert 149468 - mirror of http://codereview.chromium.org/10825089/ This made the ChromiumOS bot blow up. make: *** No rule to make target `c/Release/obj.target/skia_opts/src/opts/SkBitmapProcState_matrixProcs_neon.o', needed by `c/Release/obj.tar http://build.chromium.org/p/chromium.chromiumos/builders/ChromiumOS%20%28daisy%29/builds/1703/steps/cbuildbot/logs/stdio roll skia to 4889 Review URL: https://chromiumcodereview.appspot.com/10827122 TBR=reed@google.com Review URL: https://chromiumcodereview.appspot.com/10843036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149489 0039d316-1c4b-4281-b951-d872f2087c98 --- skia/skia.gyp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'skia/skia.gyp') diff --git a/skia/skia.gyp b/skia/skia.gyp index a93fe6f..824a748 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -254,8 +254,6 @@ '../third_party/skia/src/core/SkMallocPixelRef.cpp', '../third_party/skia/src/core/SkMask.cpp', '../third_party/skia/src/core/SkMaskFilter.cpp', - '../third_party/skia/src/core/SkMaskGamma.cpp', - '../third_party/skia/src/core/SkMaskGamma.h', '../third_party/skia/src/core/SkMath.cpp', '../third_party/skia/src/core/SkMatrix.cpp', '../third_party/skia/src/core/SkMetaData.cpp', @@ -550,6 +548,8 @@ '../third_party/skia/src/ports/SkFontHost_android.cpp', #'../third_party/skia/src/ports/SkFontHost_ascender.cpp', '../third_party/skia/src/ports/SkFontHost_tables.cpp', + '../third_party/skia/src/ports/SkFontHost_gamma.cpp', + '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp', #'../third_party/skia/src/ports/SkFontHost_linux.cpp', '../third_party/skia/src/ports/SkFontHost_mac.cpp', #'../third_party/skia/src/ports/SkFontHost_none.cpp', @@ -571,6 +571,7 @@ #'../third_party/skia/src/ports/SkXMLParser_expat.cpp', #'../third_party/skia/src/ports/SkXMLParser_tinyxml.cpp', #'../third_party/skia/src/ports/SkXMLPullParser_expat.cpp', + '../third_party/skia/src/ports/sk_predefined_gamma.h', '../third_party/skia/src/sfnt/SkOTUtils.cpp', '../third_party/skia/src/sfnt/SkOTUtils.h', @@ -821,8 +822,6 @@ ], 'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4800], 'defines': [ - 'SK_GAMMA_SRGB', - #'SK_GAMMA_APPLY_TO_A8', 'SK_BUILD_NO_IMAGE_ENCODE', 'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"', 'GR_STATIC_RECT_VB=1', @@ -871,6 +870,8 @@ [ 'OS != "android"', { 'sources/': [ ['exclude', '_android\\.(cc|cpp)$'], + # Below files are only used by Android + ['exclude', '../third_party/skia/src/ports/SkFontHost_gamma\\.cpp$'], ], 'defines': [ 'SK_DEFAULT_FONT_CACHE_LIMIT=(20*1024*1024)', @@ -924,6 +925,8 @@ 'sources/': [ ['exclude', '_linux\\.(cc|cpp)$'] ], 'sources!': [ '../third_party/skia/src/ports/SkFontHost_FreeType.cpp', + '../third_party/skia/src/ports/SkFontHost_TryeType_Tables.cpp', + '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp', ], }], [ 'use_aura == 1 and use_canvas_skia == 1', { @@ -981,6 +984,7 @@ 'sources!': [ 'ext/vector_platform_device_skia.cc', '../third_party/skia/src/pdf/SkPDFFont.cpp', + '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp', ], 'export_dependent_settings': [ '../third_party/harfbuzz/harfbuzz.gyp:harfbuzz', @@ -1090,10 +1094,6 @@ 'direct_dependent_settings': { 'include_dirs': [ 'config', - - #temporary until we can hide SkFontHost - '../third_party/skia/src/core', - '../third_party/skia/include/config', '../third_party/skia/include/core', '../third_party/skia/include/effects', @@ -1258,9 +1258,6 @@ 'sources': [ '../third_party/skia/src/opts/memset16_neon.S', '../third_party/skia/src/opts/memset32_neon.S', - '../src/opts/SkBitmapProcState_matrixProcs_neon.cpp', - '../src/opts/SkBitmapProcState_matrix_clamp_neon.h', - '../src/opts/SkBitmapProcState_matrix_repeat_neon.h', ], }], [ 'target_arch == "arm" and armv7 != 1', { -- cgit v1.1