Merge from Chromium at DEPS revision 232870
This commit was generated by merge_to_master.py.
Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
diff --git a/skia/skia_chrome.target.darwin-arm.mk b/skia/skia_chrome.target.darwin-arm.mk
index 554a4ec..48552a3 100644
--- a/skia/skia_chrome.target.darwin-arm.mk
+++ b/skia/skia_chrome.target.darwin-arm.mk
@@ -100,6 +100,8 @@
'-DSK_SUPPORT_GPU=1' \
'-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
'-DSK_ENABLE_LEGACY_API_ALIASING=1' \
+ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
@@ -200,6 +202,8 @@
'-DSK_SUPPORT_GPU=1' \
'-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
'-DSK_ENABLE_LEGACY_API_ALIASING=1' \
+ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \