Merge from Chromium at DEPS revision 273901
This commit was generated by merge_to_master.py.
Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
diff --git a/skia/skia_opts_neon.target.darwin-arm.mk b/skia/skia_opts_neon.target.darwin-arm.mk
index 7428b9e..e844a5d 100644
--- a/skia/skia_opts_neon.target.darwin-arm.mk
+++ b/skia/skia_opts_neon.target.darwin-arm.mk
@@ -45,10 +45,17 @@
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-mfpu=neon \
-fomit-frame-pointer \
-Wno-format \
-fno-tree-sra \
+ -fno-partial-inlining \
+ -fno-early-inlining \
+ -fno-tree-copy-prop \
+ -fno-tree-loop-optimize \
+ -fno-move-loop-invariants \
+ -fno-caller-saves \
-Wno-psabi \
-ffunction-sections \
-funwind-tables \
@@ -84,12 +91,17 @@
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NEW_GAMEPAD_API=1' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
+ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
'-DVIDEO_HOLE=1' \
'-DSK_ENABLE_INST_COUNT=0' \
'-DSK_SUPPORT_GPU=1' \
@@ -98,10 +110,12 @@
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
'-DGR_GL_IGNORE_ES3_MSAA=0' \
'-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \
- '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \
'-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
+ '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \
'-DSK_SUPPORT_LEGACY_N32_NAME' \
- '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \
+ '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \
+ '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \
+ '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \
'-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
@@ -113,6 +127,7 @@
'-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \
'-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \
'-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE' \
+ '-DSK_IGNORE_DWRITE_BITMAP_FIX' \
'-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \
'-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
'-DSK_GAMMA_APPLY_TO_A8' \
@@ -167,10 +182,17 @@
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-mfpu=neon \
-fomit-frame-pointer \
-Wno-format \
-fno-tree-sra \
+ -fno-partial-inlining \
+ -fno-early-inlining \
+ -fno-tree-copy-prop \
+ -fno-tree-loop-optimize \
+ -fno-move-loop-invariants \
+ -fno-caller-saves \
-Wno-psabi \
-ffunction-sections \
-funwind-tables \
@@ -206,12 +228,17 @@
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NEW_GAMEPAD_API=1' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
+ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
'-DVIDEO_HOLE=1' \
'-DSK_ENABLE_INST_COUNT=0' \
'-DSK_SUPPORT_GPU=1' \
@@ -220,10 +247,12 @@
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
'-DGR_GL_IGNORE_ES3_MSAA=0' \
'-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \
- '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \
'-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
+ '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \
'-DSK_SUPPORT_LEGACY_N32_NAME' \
- '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \
+ '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \
+ '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \
+ '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \
'-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
@@ -235,6 +264,7 @@
'-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \
'-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \
'-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE' \
+ '-DSK_IGNORE_DWRITE_BITMAP_FIX' \
'-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \
'-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
'-DSK_GAMMA_APPLY_TO_A8' \