Merge from Chromium at DEPS revision 39.0.2171.44
This commit was generated by merge_to_master.py.
Change-Id: I12ecf158017b8be5f9a1d33f4152e5a3c812cb7f
diff --git a/components/autofill_core_browser.target.darwin-mips.mk b/components/autofill_core_browser.target.darwin-mips.mk
index 01d2765..a8cded9 100644
--- a/components/autofill_core_browser.target.darwin-mips.mk
+++ b/components/autofill_core_browser.target.darwin-mips.mk
@@ -144,6 +144,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \
@@ -305,6 +306,7 @@
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DSK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_ENABLE_DYLOAD=0' \
'-DFEATURE_ENABLE_SSL' \