Merge from Chromium at DEPS revision 288042
This commit was generated by merge_to_master.py.
Change-Id: I583602ff16d735199f1810565c9296e970ce2854
diff --git a/skia/skia_chrome.target.darwin-arm.mk b/skia/skia_chrome.target.darwin-arm.mk
index 425ef83..3f81bbc 100644
--- a/skia/skia_chrome.target.darwin-arm.mk
+++ b/skia/skia_chrome.target.darwin-arm.mk
@@ -109,7 +109,6 @@
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -134,7 +133,6 @@
'-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \
'-DIGNORE_ROT_AA_RECT_OPT' \
'-DSK_IGNORE_BLURRED_RRECT_OPT' \
- '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \
'-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \
'-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \
'-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE' \
@@ -143,7 +141,7 @@
'-DSK_GAMMA_EXPONENT=1.4' \
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
- '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \
+ '-DSK_ARM_HAS_OPTIONAL_NEON' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
@@ -254,7 +252,6 @@
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
- '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -279,7 +276,6 @@
'-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \
'-DIGNORE_ROT_AA_RECT_OPT' \
'-DSK_IGNORE_BLURRED_RRECT_OPT' \
- '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \
'-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \
'-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \
'-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE' \
@@ -288,7 +284,7 @@
'-DSK_GAMMA_EXPONENT=1.4' \
'-DSK_GAMMA_CONTRAST=0.0' \
'-DSK_USE_POSIX_THREADS' \
- '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \
+ '-DSK_ARM_HAS_OPTIONAL_NEON' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \