diff options
author | Torne (Richard Coles) <torne@google.com> | 2014-06-25 10:30:53 +0100 |
---|---|---|
committer | Torne (Richard Coles) <torne@google.com> | 2014-06-25 10:30:53 +0100 |
commit | 6d86b77056ed63eb6871182f42a9fd5f07550f90 (patch) | |
tree | 4bd56255660f52e406fbd45083c006cd6ddb2877 /android_webview/android_webview_common.target.linux-arm.mk | |
parent | e9f930807da3850e29ecc641d2becc0403b5709c (diff) | |
download | chromium_org-6d86b77056ed63eb6871182f42a9fd5f07550f90.tar.gz |
Merge from Chromium at DEPS revision 278856
This commit was generated by merge_to_master.py.
Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
Diffstat (limited to 'android_webview/android_webview_common.target.linux-arm.mk')
-rw-r--r-- | android_webview/android_webview_common.target.linux-arm.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/android_webview/android_webview_common.target.linux-arm.mk b/android_webview/android_webview_common.target.linux-arm.mk index b7c23c9cd3..dc4d7ec97a 100644 --- a/android_webview/android_webview_common.target.linux-arm.mk +++ b/android_webview/android_webview_common.target.linux-arm.mk @@ -46,6 +46,7 @@ LOCAL_SRC_FILES := \ android_webview/browser/aw_request_interceptor.cc \ android_webview/browser/aw_resource_context.cc \ android_webview/browser/aw_web_preferences_populater.cc \ + android_webview/browser/aw_web_resource_response.cc \ android_webview/browser/browser_view_renderer.cc \ android_webview/browser/deferred_gpu_command_service.cc \ android_webview/browser/find_helper.cc \ @@ -53,7 +54,6 @@ LOCAL_SRC_FILES := \ android_webview/browser/gpu_memory_buffer_factory_impl.cc \ android_webview/browser/hardware_renderer.cc \ android_webview/browser/icon_helper.cc \ - android_webview/browser/intercepted_request_data.cc \ android_webview/browser/gl_view_renderer_manager.cc \ android_webview/browser/net/android_stream_reader_url_request_job.cc \ android_webview/browser/net/aw_network_delegate.cc \ @@ -149,6 +149,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' \ '-DLIBPEERCONNECTION_LIB=1' \ @@ -166,6 +167,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' \ @@ -308,6 +310,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' \ '-DLIBPEERCONNECTION_LIB=1' \ @@ -325,6 +328,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' \ |