Merge from Chromium at DEPS revision 260458
This commit was generated by merge_to_master.py.
Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
diff --git a/skia/skia_chrome.target.darwin-arm.mk b/skia/skia_chrome.target.darwin-arm.mk
index 9f47e91..012a994 100644
--- a/skia/skia_chrome.target.darwin-arm.mk
+++ b/skia/skia_chrome.target.darwin-arm.mk
@@ -110,9 +110,7 @@
'-DGR_GL_IGNORE_ES3_MSAA=0' \
'-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \
'-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \
- '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \
'-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \
- '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \
'-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \
'-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
'-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
@@ -134,6 +132,7 @@
'-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DUSE_OPENSSL=1' \
+ '-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -239,9 +238,7 @@
'-DGR_GL_IGNORE_ES3_MSAA=0' \
'-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \
'-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \
- '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \
'-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \
- '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \
'-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \
'-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
'-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
@@ -263,6 +260,7 @@
'-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DUSE_OPENSSL=1' \
+ '-DUSE_OPENSSL_CERTS=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \