Merge from Chromium at DEPS revision 269336
This commit was generated by merge_to_master.py.
Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
diff --git a/skia/skia_library.target.linux-x86_64.mk b/skia/skia_library.target.linux-x86_64.mk
index 903ca72..dd29c40 100644
--- a/skia/skia_library.target.linux-x86_64.mk
+++ b/skia/skia_library.target.linux-x86_64.mk
@@ -29,7 +29,7 @@
third_party/skia/src/core/SkPaintOptionsAndroid.cpp \
third_party/skia/src/ports/SkImageDecoder_empty.cpp \
third_party/skia/src/images/SkScaledBitmapSampler.cpp \
- third_party/skia/src/opts/opts_check_SSE2.cpp \
+ third_party/skia/src/opts/opts_check_x86.cpp \
third_party/skia/src/ports/SkFontConfigInterface_android.cpp \
third_party/skia/src/ports/SkFontHost_fontconfig.cpp \
third_party/skia/src/fonts/SkFontMgr_indirect.cpp \
@@ -335,6 +335,7 @@
third_party/skia/src/gpu/GrClipMaskCache.cpp \
third_party/skia/src/gpu/GrClipMaskManager.cpp \
third_party/skia/src/gpu/GrGpu.cpp \
+ third_party/skia/src/gpu/GrGpuObject.cpp \
third_party/skia/src/gpu/GrGpuFactory.cpp \
third_party/skia/src/gpu/GrInOrderDrawBuffer.cpp \
third_party/skia/src/gpu/GrLayerCache.cpp \
@@ -350,7 +351,6 @@
third_party/skia/src/gpu/GrRectanizer_skyline.cpp \
third_party/skia/src/gpu/GrRenderTarget.cpp \
third_party/skia/src/gpu/GrReducedClip.cpp \
- third_party/skia/src/gpu/GrResource.cpp \
third_party/skia/src/gpu/GrResourceCache.cpp \
third_party/skia/src/gpu/GrStencil.cpp \
third_party/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp \
@@ -426,7 +426,6 @@
-Wno-format \
-m64 \
-march=x86-64 \
- -fuse-ld=gold \
-ffunction-sections \
-funwind-tables \
-g \
@@ -477,11 +476,6 @@
'-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \
'-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
'-DSK_SUPPORT_LEGACY_N32_NAME' \
- '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \
- '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \
- '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \
- '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \
- '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \
'-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \
'-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
'-DSK_BUILD_FOR_ANDROID' \
@@ -571,7 +565,6 @@
-Wno-format \
-m64 \
-march=x86-64 \
- -fuse-ld=gold \
-ffunction-sections \
-funwind-tables \
-g \
@@ -622,11 +615,6 @@
'-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \
'-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
'-DSK_SUPPORT_LEGACY_N32_NAME' \
- '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \
- '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \
- '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \
- '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \
- '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \
'-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \
'-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
'-DSK_BUILD_FOR_ANDROID' \