From 6d86b77056ed63eb6871182f42a9fd5f07550f90 Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Wed, 25 Jun 2014 10:30:53 +0100 Subject: Merge from Chromium at DEPS revision 278856 This commit was generated by merge_to_master.py. Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3 --- android_webview/native/webview_native.target.linux-x86.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'android_webview/native/webview_native.target.linux-x86.mk') diff --git a/android_webview/native/webview_native.target.linux-x86.mk b/android_webview/native/webview_native.target.linux-x86.mk index 3984346f6f..f1e061d6a4 100644 --- a/android_webview/native/webview_native.target.linux-x86.mk +++ b/android_webview/native/webview_native.target.linux-x86.mk @@ -47,9 +47,9 @@ LOCAL_SRC_FILES := \ android_webview/native/aw_web_contents_delegate.cc \ android_webview/native/aw_web_contents_view_delegate.cc \ android_webview/native/aw_web_preferences_populater_impl.cc \ + android_webview/native/aw_web_resource_response_impl.cc \ android_webview/native/cookie_manager.cc \ android_webview/native/input_stream_impl.cc \ - android_webview/native/intercepted_request_data_impl.cc \ android_webview/native/java_browser_view_renderer_helper.cc \ android_webview/native/net_init_native_callback.cc \ android_webview/native/permission/aw_permission_request.cc \ @@ -120,6 +120,7 @@ MY_DEFS_Debug := \ '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ + '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ '-DMOJO_USE_SYSTEM_IMPL' \ '-DSK_ENABLE_INST_COUNT=0' \ @@ -135,6 +136,7 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ '-DSK_SUPPORT_LEGACY_SETCONFIG' \ '-DSK_IGNORE_ETC1_SUPPORT' \ + '-DSK_IGNORE_GPU_DITHER' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -255,6 +257,7 @@ MY_DEFS_Release := \ '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ + '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ '-DMOJO_USE_SYSTEM_IMPL' \ '-DSK_ENABLE_INST_COUNT=0' \ @@ -270,6 +273,7 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ '-DSK_SUPPORT_LEGACY_SETCONFIG' \ '-DSK_IGNORE_ETC1_SUPPORT' \ + '-DSK_IGNORE_GPU_DITHER' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ -- cgit v1.2.3