Revert 150822 - Roll Skia DEPS to 5029 & skia.gyp changes

control: http://codereview.chromium.org/10836175/
Review URL: https://chromiumcodereview.appspot.com/10832223

TBR=robertphillips@google.com
Review URL: https://chromiumcodereview.appspot.com/10834258

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150856 0039d316-1c4b-4281-b951-d872f2087c98
parent 63a0c1dc
......@@ -29,7 +29,7 @@ vars = {
"ffmpeg_hash": "2079ffae30f8da6c6eed985cce00e04c31b40888",
"sfntly_revision": "134",
"skia_revision": "5029",
"skia_revision": "5003",
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Skia
# and V8 without interference from each other.
......
......@@ -272,7 +272,6 @@
'../third_party/skia/src/core/SkPathHeap.cpp',
'../third_party/skia/src/core/SkPathHeap.h',
'../third_party/skia/src/core/SkPathMeasure.cpp',
'../third_party/skia/src/core/SkPerspIter.h',
'../third_party/skia/src/core/SkPicture.cpp',
'../third_party/skia/src/core/SkPictureFlat.cpp',
'../third_party/skia/src/core/SkPictureFlat.h',
......@@ -642,6 +641,7 @@
'../third_party/skia/include/core/SkPath.h',
'../third_party/skia/include/core/SkPathEffect.h',
'../third_party/skia/include/core/SkPathMeasure.h',
'../third_party/skia/include/core/SkPerspIter.h',
'../third_party/skia/include/core/SkPicture.h',
'../third_party/skia/include/core/SkPixelRef.h',
'../third_party/skia/include/core/SkPoint.h',
......@@ -1252,7 +1252,6 @@
'sources': [
'../third_party/skia/src/opts/SkBitmapProcState_opts_arm.cpp',
'../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp',
'../third_party/skia/src/opts/SkBlitRow_opts_arm.h',
'../third_party/skia/src/opts/opts_check_arm.cpp',
],
}],
......@@ -1265,11 +1264,9 @@
'sources': [
'../third_party/skia/src/opts/memset16_neon.S',
'../third_party/skia/src/opts/memset32_neon.S',
'../third_party/skia/src/opts/SkBitmapProcState_arm_neon.cpp',
'../third_party/skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp',
'../third_party/skia/src/opts/SkBitmapProcState_matrix_clamp_neon.h',
'../third_party/skia/src/opts/SkBitmapProcState_matrix_repeat_neon.h',
'../third_party/skia/src/opts/SkBlitRow_opts_arm_neon.cpp',
],
}],
[ 'target_arch == "arm" and armv7 != 1', {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment