Merge from Chromium at DEPS revision r200144
This commit was generated by merge_to_master.py.
Change-Id: I52995489013675af682cee321f417f624396b584
diff --git a/Source/core/core.gyp/webcore_platform_geometry.target.darwin-x86.mk b/Source/core/core.gyp/webcore_platform_geometry.target.darwin-x86.mk
index a3b73a3..f6e5cee 100644
--- a/Source/core/core.gyp/webcore_platform_geometry.target.darwin-x86.mk
+++ b/Source/core/core.gyp/webcore_platform_geometry.target.darwin-x86.mk
@@ -100,14 +100,11 @@
'-DENABLE_CSS_REGIONS=1' \
'-DENABLE_CUSTOM_SCHEME_HANDLER=0' \
'-DENABLE_ENCRYPTED_MEDIA=1' \
- '-DENABLE_RESOLUTION_MEDIA_QUERY=0' \
'-DENABLE_SVG=1' \
'-DENABLE_SVG_FONTS=1' \
'-DENABLE_TOUCH_ICON_LOADING=1' \
'-DENABLE_WEBGL=1' \
'-DENABLE_XHR_TIMEOUT=0' \
- '-DWTF_USE_BUILTIN_UTF8_CODEC=1' \
- '-DWTF_USE_WEBKIT_IMAGE_DECODERS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
'-DENABLE_CALENDAR_PICKER=0' \
'-DENABLE_DATALIST_ELEMENT=0' \
@@ -133,7 +130,7 @@
'-DGR_AGGRESSIVE_SHADER_OPTS=1' \
'-DSK_ENABLE_INST_COUNT=0' \
'-DSK_USE_POSIX_THREADS' \
- '-DSK_BUILD_FOR_ANDROID_NDK' \
+ '-DSK_BUILD_FOR_ANDROID' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DLIBXML_STATIC' \