Merge from Chromium at DEPS revision 240154
This commit was generated by merge_to_master.py.
Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
diff --git a/skia/skia_opts_neon.target.darwin-arm.mk b/skia/skia_opts_neon.target.darwin-arm.mk
index 63a8a1a..c7cc5ca 100644
--- a/skia/skia_opts_neon.target.darwin-arm.mk
+++ b/skia/skia_opts_neon.target.darwin-arm.mk
@@ -26,8 +26,10 @@
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/SkBlitMask_opts_arm_neon.cpp \
third_party/skia/src/opts/SkBlitRow_opts_arm_neon.cpp \
third_party/skia/src/opts/SkXfermode_opts_arm_neon.cpp \
+ third_party/skia/src/opts/SkBlurImage_opts_neon.cpp \
third_party/skia/src/opts/SkMorphology_opts_neon.cpp
@@ -71,6 +73,7 @@
MY_DEFS_Debug := \
'-DANGLE_DX11' \
+ '-DV8_DEPRECATION_WARNINGS' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -80,9 +83,11 @@
'-DENABLE_CONFIGURATION_POLICY' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \
'-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
@@ -161,6 +166,7 @@
MY_DEFS_Release := \
'-DANGLE_DX11' \
+ '-DV8_DEPRECATION_WARNINGS' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -170,9 +176,11 @@
'-DENABLE_CONFIGURATION_POLICY' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \
'-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \