Merge from Chromium at DEPS revision 262940
This commit was generated by merge_to_master.py.
Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
diff --git a/skia/skia_library.target.linux-x86_64.mk b/skia/skia_library.target.linux-x86_64.mk
index edd71d1..2de04ff 100644
--- a/skia/skia_library.target.linux-x86_64.mk
+++ b/skia/skia_library.target.linux-x86_64.mk
@@ -6,13 +6,14 @@
LOCAL_MODULE := skia_skia_library_gyp
LOCAL_MODULE_SUFFIX := .a
LOCAL_MODULE_TAGS := optional
-gyp_intermediate_dir := $(call local-intermediates-dir)
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
+LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
+gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
+gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \
- $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp,,,$(GYP_VAR_PREFIX))/blink_skia_config.stamp \
+ $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp,,,$(GYP_VAR_PREFIX))/expat.stamp
GYP_GENERATED_OUTPUTS :=
@@ -115,6 +116,7 @@
third_party/skia/src/core/SkFlattenableSerialization.cpp \
third_party/skia/src/core/SkFloat.cpp \
third_party/skia/src/core/SkFloatBits.cpp \
+ third_party/skia/src/core/SkFont.cpp \
third_party/skia/src/core/SkFontHost.cpp \
third_party/skia/src/core/SkFontDescriptor.cpp \
third_party/skia/src/core/SkFontStream.cpp \
@@ -146,6 +148,7 @@
third_party/skia/src/core/SkPictureFlat.cpp \
third_party/skia/src/core/SkPicturePlayback.cpp \
third_party/skia/src/core/SkPictureRecord.cpp \
+ third_party/skia/src/core/SkPictureShader.cpp \
third_party/skia/src/core/SkPictureStateTree.cpp \
third_party/skia/src/core/SkPixelRef.cpp \
third_party/skia/src/core/SkPoint.cpp \
@@ -273,7 +276,6 @@
third_party/skia/src/effects/SkPixelXorXfermode.cpp \
third_party/skia/src/effects/SkPorterDuff.cpp \
third_party/skia/src/effects/SkRectShaderImageFilter.cpp \
- third_party/skia/src/effects/SkResizeImageFilter.cpp \
third_party/skia/src/effects/SkStippleMaskFilter.cpp \
third_party/skia/src/effects/SkTableColorFilter.cpp \
third_party/skia/src/effects/SkTableMaskFilter.cpp \
@@ -289,6 +291,7 @@
third_party/skia/src/effects/gradients/SkRadialGradient.cpp \
third_party/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp \
third_party/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp \
+ third_party/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp \
third_party/skia/src/effects/gradients/SkSweepGradient.cpp \
third_party/skia/src/pdf/SkPDFCatalog.cpp \
third_party/skia/src/pdf/SkPDFDevice.cpp \
@@ -328,6 +331,7 @@
third_party/skia/src/gpu/GrGpu.cpp \
third_party/skia/src/gpu/GrGpuFactory.cpp \
third_party/skia/src/gpu/GrInOrderDrawBuffer.cpp \
+ third_party/skia/src/gpu/GrLayerCache.cpp \
third_party/skia/src/gpu/GrMemoryPool.cpp \
third_party/skia/src/gpu/GrOvalRenderer.cpp \
third_party/skia/src/gpu/GrPaint.cpp \
@@ -462,10 +466,8 @@
'-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
'-DGR_GL_IGNORE_ES3_MSAA=0' \
- '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \
'-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \
'-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \
- '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \
'-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
'-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
'-DSK_BUILD_FOR_ANDROID' \
@@ -484,6 +486,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -601,10 +604,8 @@
'-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
'-DGR_GL_IGNORE_ES3_MSAA=0' \
- '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \
'-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \
'-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \
- '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \
'-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
'-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
'-DSK_BUILD_FOR_ANDROID' \
@@ -623,6 +624,7 @@
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_IGNORE_FREETYPE_ROTATION_FIX' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
@@ -685,9 +687,9 @@
### Rules for final target.
LOCAL_LDFLAGS_Debug := \
- -Wl,--fatal-warnings \
-Wl,-z,now \
-Wl,-z,relro \
+ -Wl,--fatal-warnings \
-Wl,-z,noexecstack \
-fPIC \
-m64 \
@@ -702,9 +704,9 @@
LOCAL_LDFLAGS_Release := \
- -Wl,--fatal-warnings \
-Wl,-z,now \
-Wl,-z,relro \
+ -Wl,--fatal-warnings \
-Wl,-z,noexecstack \
-fPIC \
-m64 \