Merge from Chromium at DEPS revision 284076
This commit was generated by merge_to_master.py.
Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
diff --git a/skia/skia_chrome.target.darwin-arm.mk b/skia/skia_chrome.target.darwin-arm.mk
index 96f87eb..425ef83 100644
--- a/skia/skia_chrome.target.darwin-arm.mk
+++ b/skia/skia_chrome.target.darwin-arm.mk
@@ -88,9 +88,9 @@
-Wno-sequence-point \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
@@ -109,6 +109,7 @@
'-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/"' \
@@ -124,18 +125,13 @@
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
'-DGR_GL_IGNORE_ES3_MSAA=0' \
'-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \
- '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
- '-DSK_SUPPORT_LEGACY_BITMAP_CONFIG' \
- '-DSK_SUPPORT_LEGACY_DEVICE_VIRTUAL_ISOPAQUE' \
- '-DSK_SUPPORT_LEGACY_N32_NAME' \
- '-DSK_SUPPORT_LEGACY_SETCONFIG' \
+ '-DSK_SUPPORT_LEGACY_PICTURE_CLONE' \
+ '-DSK_SUPPORT_LEGACY_GETDEVICE' \
'-DSK_IGNORE_ETC1_SUPPORT' \
'-DSK_IGNORE_GPU_DITHER' \
- '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
'-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \
- '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
'-DIGNORE_ROT_AA_RECT_OPT' \
'-DSK_IGNORE_BLURRED_RRECT_OPT' \
'-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \
@@ -190,6 +186,9 @@
-fvisibility-inlines-hidden \
-Wno-deprecated \
-Wno-abi \
+ -std=gnu++11 \
+ -Wno-narrowing \
+ -Wno-literal-suffix \
-Wno-non-virtual-dtor \
-Wno-sign-promo \
-Wno-non-virtual-dtor
@@ -255,6 +254,7 @@
'-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/"' \
@@ -270,18 +270,13 @@
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
'-DGR_GL_IGNORE_ES3_MSAA=0' \
'-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \
- '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
- '-DSK_SUPPORT_LEGACY_BITMAP_CONFIG' \
- '-DSK_SUPPORT_LEGACY_DEVICE_VIRTUAL_ISOPAQUE' \
- '-DSK_SUPPORT_LEGACY_N32_NAME' \
- '-DSK_SUPPORT_LEGACY_SETCONFIG' \
+ '-DSK_SUPPORT_LEGACY_PICTURE_CLONE' \
+ '-DSK_SUPPORT_LEGACY_GETDEVICE' \
'-DSK_IGNORE_ETC1_SUPPORT' \
'-DSK_IGNORE_GPU_DITHER' \
- '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
'-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \
- '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
'-DIGNORE_ROT_AA_RECT_OPT' \
'-DSK_IGNORE_BLURRED_RRECT_OPT' \
'-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \
@@ -336,6 +331,9 @@
-fvisibility-inlines-hidden \
-Wno-deprecated \
-Wno-abi \
+ -std=gnu++11 \
+ -Wno-narrowing \
+ -Wno-literal-suffix \
-Wno-non-virtual-dtor \
-Wno-sign-promo \
-Wno-non-virtual-dtor