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 | |
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')
140 files changed, 2547 insertions, 749 deletions
diff --git a/android_webview/Android.mk b/android_webview/Android.mk index 525fb8422e..215dd28acc 100644 --- a/android_webview/Android.mk +++ b/android_webview/Android.mk @@ -13,73 +13,37 @@ LOCAL_MODULE := android_webview_java LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(call all-java-files-under, java/src) - +include $(LOCAL_PATH)/java_library_common.mk # resource glue layer LOCAL_SRC_FILES += \ $(call all-java-files-under, ../content/public/android/java/resource_map) \ $(call all-java-files-under, ../ui/android/java/resource_map) \ -# contentview and its dependencies -LOCAL_AIDL_INCLUDES := \ - $(LOCAL_PATH)/../content/public/android/java/src \ - $(LOCAL_PATH)/../net/android/java/src \ - $(LOCAL_PATH)/../third_party/eyesfree/src/android/java/src -LOCAL_SRC_FILES += \ - $(call all-java-files-under, ../content/public/android/java/src) \ - ../content/public/android/java/src/org/chromium/content/common/IChildProcessCallback.aidl \ - ../content/public/android/java/src/org/chromium/content/common/IChildProcessService.aidl \ - ../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStoreCallbacks.aidl \ - ../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStore.aidl \ - $(call all-java-files-under, ../base/android/java/src) \ - $(call all-java-files-under, ../media/base/android/java/src) \ - $(call all-java-files-under, ../net/android/java/src) \ - $(call all-java-files-under, ../ui/android/java/src) \ - $(call all-java-files-under, ../third_party/eyesfree/src/android/java/src) \ - $(call all-Iaidl-files-under, ../third_party/eyesfree/src/android/java/src) - -# browser components -LOCAL_SRC_FILES += \ - $(call all-java-files-under, \ - ../components/web_contents_delegate_android/android/java/src) \ - $(call all-java-files-under, \ - ../components/navigation_interception/android/java/src) \ - -# This directory includes .java files that are generated by the normal gyp build, but are checked in -# for the Android build. -# TODO(torne, cjhopman): Consider removing this. -LOCAL_SRC_FILES += \ - $(call all-java-files-under, java/generated_src) - -# Java files generated from .template rules. This list should match list of java dependencies in -# android_webview/all_webview.gyp -# TODO(torne): remove TARGET_2ND_ARCH here once we're no longer 64-bit blacklisted in the Android -# build system. http://crbug.com/358141 -LOCAL_GENERATED_SOURCES := \ -$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/base/ApplicationState.java \ -$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/base/MemoryPressureLevelList.java \ -$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/GestureEventType.java \ -$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/PageTransitionTypes.java \ -$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/SpeechRecognitionError.java \ -$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/input/CanonicalAxisIndex.java \ -$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/input/CanonicalButtonIndex.java \ -$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/input/PopupItemType.java \ -$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/common/ResultCodes.java \ -$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/common/ScreenOrientationValues.java \ -$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/media/ImageFormat.java \ -$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/net/CertificateMimeType.java \ -$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/net/CertVerifyStatusAndroid.java \ -$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/net/NetError.java \ -$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/net/PrivateKeyType.java \ -$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/ui/WindowOpenDisposition.java \ -$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/ui/gfx/BitmapFormat.java \ - -# content dependencies on java components that are provided by the system on -# android -LOCAL_STATIC_JAVA_LIBRARIES += jsr305 guava - include $(BUILD_STATIC_JAVA_LIBRARY) +######################################################## +# This is intended to replace android_webview_java once the Android side of +# the code that uses the WebView is updated. In the transition period the +# goal of having this here is to make sure the new build isn't broken. +include $(CLEAR_VARS) +LOCAL_MODULE := android_webview_java_with_new_resources + +LOCAL_MODULE_TAGS := optional + +# Depend on the android_webview_strings target to ensure the grd->string.xml +# processing takes place. +LOCAL_ADDITIONAL_DEPENDENCIES := \ + $(call intermediates-dir-for,GYP,android_webview_resources,,,$(TARGET_2ND_ARCH))/android_webview_resources.stamp + +include $(LOCAL_PATH)/java_library_common.mk + +# resources +include $(LOCAL_PATH)/build/resources_config.mk +LOCAL_FULL_MANIFEST_FILE := $(android_webview_manifest_file) +LOCAL_RESOURCE_DIR := $(android_webview_resources_dirs) +LOCAL_AAPT_FLAGS := $(android_webview_aapt_flags) + +include $(BUILD_STATIC_JAVA_LIBRARY) ######################################################## # These packages are the resource paks used by webview. diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index 2d7c31fd64..9f24bfc94d 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -154,6 +154,8 @@ 'browser/aw_result_codes.h', 'browser/aw_web_preferences_populater.cc', 'browser/aw_web_preferences_populater.h', + 'browser/aw_web_resource_response.cc', + 'browser/aw_web_resource_response.h', 'browser/browser_view_renderer.cc', 'browser/browser_view_renderer.h', 'browser/browser_view_renderer_client.h', @@ -171,8 +173,6 @@ 'browser/icon_helper.cc', 'browser/icon_helper.h', 'browser/input_stream.h', - 'browser/intercepted_request_data.cc', - 'browser/intercepted_request_data.h', 'browser/jni_dependency_factory.h', 'browser/gl_view_renderer_manager.cc', 'browser/gl_view_renderer_manager.h', @@ -266,12 +266,34 @@ }, { # android_webview_build==1 'targets': [ { - 'target_name': 'android_webview_strings', + 'target_name': 'android_webview_jarjar_ui_resources', + 'android_unmangled_name': 1, + 'type': 'none', + 'variables': { + 'res_dir': '../ui/android/java/res', + 'rules_file': '../android_webview/build/jarjar-rules.txt', + }, + 'includes': ['../android_webview/build/jarjar_resources.gypi'], + }, + { + 'target_name': 'android_webview_jarjar_content_resources', + 'android_unmangled_name': 1, + 'type': 'none', + 'variables': { + 'res_dir': '../content/public/android/java/res', + 'rules_file': '../android_webview/build/jarjar-rules.txt', + }, + 'includes': ['../android_webview/build/jarjar_resources.gypi'], + }, + { + 'target_name': 'android_webview_resources', 'type': 'none', 'android_unmangled_name': 1, 'dependencies': [ '../content/content.gyp:content_strings_grd', '../ui/android/ui_android.gyp:ui_strings_grd', + 'android_webview_jarjar_ui_resources', + 'android_webview_jarjar_content_resources' ], }, ], diff --git a/android_webview/android_webview_common.target.darwin-arm.mk b/android_webview/android_webview_common.target.darwin-arm.mk index b7c23c9cd3..dc4d7ec97a 100644 --- a/android_webview/android_webview_common.target.darwin-arm.mk +++ b/android_webview/android_webview_common.target.darwin-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' \ diff --git a/android_webview/android_webview_common.target.darwin-arm64.mk b/android_webview/android_webview_common.target.darwin-arm64.mk index 20c82af153..0fff2d657e 100644 --- a/android_webview/android_webview_common.target.darwin-arm64.mk +++ b/android_webview/android_webview_common.target.darwin-arm64.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 \ @@ -139,6 +139,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' \ @@ -156,6 +157,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' \ @@ -287,6 +289,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' \ @@ -304,6 +307,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' \ diff --git a/android_webview/android_webview_common.target.darwin-mips.mk b/android_webview/android_webview_common.target.darwin-mips.mk index 65855aef5a..c7c0a0cb05 100644 --- a/android_webview/android_webview_common.target.darwin-mips.mk +++ b/android_webview/android_webview_common.target.darwin-mips.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 \ @@ -143,6 +143,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' \ @@ -160,6 +161,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' \ @@ -296,6 +298,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' \ @@ -313,6 +316,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' \ diff --git a/android_webview/android_webview_common.target.darwin-x86.mk b/android_webview/android_webview_common.target.darwin-x86.mk index 0c86a5e0f9..2bc814fd46 100644 --- a/android_webview/android_webview_common.target.darwin-x86.mk +++ b/android_webview/android_webview_common.target.darwin-x86.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 \ @@ -144,6 +144,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' \ @@ -161,6 +162,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' \ @@ -297,6 +299,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' \ @@ -314,6 +317,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' \ diff --git a/android_webview/android_webview_common.target.darwin-x86_64.mk b/android_webview/android_webview_common.target.darwin-x86_64.mk index 5859b68060..a93daaebdc 100644 --- a/android_webview/android_webview_common.target.darwin-x86_64.mk +++ b/android_webview/android_webview_common.target.darwin-x86_64.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 \ @@ -143,6 +143,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' \ @@ -160,6 +161,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' \ @@ -295,6 +297,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' \ @@ -312,6 +315,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' \ 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' \ diff --git a/android_webview/android_webview_common.target.linux-arm64.mk b/android_webview/android_webview_common.target.linux-arm64.mk index 20c82af153..0fff2d657e 100644 --- a/android_webview/android_webview_common.target.linux-arm64.mk +++ b/android_webview/android_webview_common.target.linux-arm64.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 \ @@ -139,6 +139,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' \ @@ -156,6 +157,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' \ @@ -287,6 +289,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' \ @@ -304,6 +307,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' \ diff --git a/android_webview/android_webview_common.target.linux-mips.mk b/android_webview/android_webview_common.target.linux-mips.mk index 65855aef5a..c7c0a0cb05 100644 --- a/android_webview/android_webview_common.target.linux-mips.mk +++ b/android_webview/android_webview_common.target.linux-mips.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 \ @@ -143,6 +143,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' \ @@ -160,6 +161,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' \ @@ -296,6 +298,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' \ @@ -313,6 +316,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' \ diff --git a/android_webview/android_webview_common.target.linux-x86.mk b/android_webview/android_webview_common.target.linux-x86.mk index 0c86a5e0f9..2bc814fd46 100644 --- a/android_webview/android_webview_common.target.linux-x86.mk +++ b/android_webview/android_webview_common.target.linux-x86.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 \ @@ -144,6 +144,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' \ @@ -161,6 +162,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' \ @@ -297,6 +299,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' \ @@ -314,6 +317,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' \ diff --git a/android_webview/android_webview_common.target.linux-x86_64.mk b/android_webview/android_webview_common.target.linux-x86_64.mk index 5859b68060..a93daaebdc 100644 --- a/android_webview/android_webview_common.target.linux-x86_64.mk +++ b/android_webview/android_webview_common.target.linux-x86_64.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 \ @@ -143,6 +143,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' \ @@ -160,6 +161,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' \ @@ -295,6 +297,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' \ @@ -312,6 +315,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' \ diff --git a/android_webview/android_webview_jarjar_content_resources.target.darwin-arm.mk b/android_webview/android_webview_jarjar_content_resources.target.darwin-arm.mk new file mode 100644 index 0000000000..d589c7fb6c --- /dev/null +++ b/android_webview/android_webview_jarjar_content_resources.target.darwin-arm.mk @@ -0,0 +1,50 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_jarjar_content_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +### Rules for action "jarjar resources": +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: $(LOCAL_PATH)/build/android/gyp/util/build_utils.py $(LOCAL_PATH)/build/android/gyp/jarjar_resources.py $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/bubble.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/bubble.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/layout-land/date_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/date_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/multi_field_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/two_field_date_picker.xml $(LOCAL_PATH)/content/public/android/java/res/layout/validation_message_bubble.xml $(LOCAL_PATH)/content/public/android/java/res/menu/select_action_menu.xml $(LOCAL_PATH)/content/public/android/java/res/mipmap-hdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-mdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-xhdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-xxhdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/values-v17/styles.xml $(LOCAL_PATH)/content/public/android/java/res/values/attrs.xml $(LOCAL_PATH)/content/public/android/java/res/values/dimens.xml $(LOCAL_PATH)/content/public/android/java/res/values/strings.xml $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/bubble.9.png $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Copying and jar-jaring resources for android_webview_jarjar_content_resources ($@)" + $(hide)cd $(gyp_local_path)/android_webview; mkdir -p $(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources; python ../build/android/gyp/jarjar_resources.py --input-dir ../content/public/android/java/res --output-dir "$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_res" --rules-path ../android_webview/build/jarjar-rules.txt --stamp "$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp" + + + +GYP_GENERATED_OUTPUTS := \ + $(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_jarjar_content_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_jarjar_content_resources.target.darwin-arm64.mk b/android_webview/android_webview_jarjar_content_resources.target.darwin-arm64.mk new file mode 100644 index 0000000000..d589c7fb6c --- /dev/null +++ b/android_webview/android_webview_jarjar_content_resources.target.darwin-arm64.mk @@ -0,0 +1,50 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_jarjar_content_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +### Rules for action "jarjar resources": +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: $(LOCAL_PATH)/build/android/gyp/util/build_utils.py $(LOCAL_PATH)/build/android/gyp/jarjar_resources.py $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/bubble.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/bubble.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/layout-land/date_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/date_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/multi_field_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/two_field_date_picker.xml $(LOCAL_PATH)/content/public/android/java/res/layout/validation_message_bubble.xml $(LOCAL_PATH)/content/public/android/java/res/menu/select_action_menu.xml $(LOCAL_PATH)/content/public/android/java/res/mipmap-hdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-mdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-xhdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-xxhdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/values-v17/styles.xml $(LOCAL_PATH)/content/public/android/java/res/values/attrs.xml $(LOCAL_PATH)/content/public/android/java/res/values/dimens.xml $(LOCAL_PATH)/content/public/android/java/res/values/strings.xml $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/bubble.9.png $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Copying and jar-jaring resources for android_webview_jarjar_content_resources ($@)" + $(hide)cd $(gyp_local_path)/android_webview; mkdir -p $(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources; python ../build/android/gyp/jarjar_resources.py --input-dir ../content/public/android/java/res --output-dir "$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_res" --rules-path ../android_webview/build/jarjar-rules.txt --stamp "$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp" + + + +GYP_GENERATED_OUTPUTS := \ + $(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_jarjar_content_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_jarjar_content_resources.target.darwin-mips.mk b/android_webview/android_webview_jarjar_content_resources.target.darwin-mips.mk new file mode 100644 index 0000000000..d589c7fb6c --- /dev/null +++ b/android_webview/android_webview_jarjar_content_resources.target.darwin-mips.mk @@ -0,0 +1,50 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_jarjar_content_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +### Rules for action "jarjar resources": +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: $(LOCAL_PATH)/build/android/gyp/util/build_utils.py $(LOCAL_PATH)/build/android/gyp/jarjar_resources.py $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/bubble.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/bubble.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/layout-land/date_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/date_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/multi_field_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/two_field_date_picker.xml $(LOCAL_PATH)/content/public/android/java/res/layout/validation_message_bubble.xml $(LOCAL_PATH)/content/public/android/java/res/menu/select_action_menu.xml $(LOCAL_PATH)/content/public/android/java/res/mipmap-hdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-mdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-xhdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-xxhdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/values-v17/styles.xml $(LOCAL_PATH)/content/public/android/java/res/values/attrs.xml $(LOCAL_PATH)/content/public/android/java/res/values/dimens.xml $(LOCAL_PATH)/content/public/android/java/res/values/strings.xml $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/bubble.9.png $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Copying and jar-jaring resources for android_webview_jarjar_content_resources ($@)" + $(hide)cd $(gyp_local_path)/android_webview; mkdir -p $(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources; python ../build/android/gyp/jarjar_resources.py --input-dir ../content/public/android/java/res --output-dir "$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_res" --rules-path ../android_webview/build/jarjar-rules.txt --stamp "$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp" + + + +GYP_GENERATED_OUTPUTS := \ + $(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_jarjar_content_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_jarjar_content_resources.target.darwin-x86.mk b/android_webview/android_webview_jarjar_content_resources.target.darwin-x86.mk new file mode 100644 index 0000000000..d589c7fb6c --- /dev/null +++ b/android_webview/android_webview_jarjar_content_resources.target.darwin-x86.mk @@ -0,0 +1,50 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_jarjar_content_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +### Rules for action "jarjar resources": +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: $(LOCAL_PATH)/build/android/gyp/util/build_utils.py $(LOCAL_PATH)/build/android/gyp/jarjar_resources.py $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/bubble.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/bubble.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/layout-land/date_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/date_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/multi_field_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/two_field_date_picker.xml $(LOCAL_PATH)/content/public/android/java/res/layout/validation_message_bubble.xml $(LOCAL_PATH)/content/public/android/java/res/menu/select_action_menu.xml $(LOCAL_PATH)/content/public/android/java/res/mipmap-hdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-mdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-xhdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-xxhdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/values-v17/styles.xml $(LOCAL_PATH)/content/public/android/java/res/values/attrs.xml $(LOCAL_PATH)/content/public/android/java/res/values/dimens.xml $(LOCAL_PATH)/content/public/android/java/res/values/strings.xml $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/bubble.9.png $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Copying and jar-jaring resources for android_webview_jarjar_content_resources ($@)" + $(hide)cd $(gyp_local_path)/android_webview; mkdir -p $(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources; python ../build/android/gyp/jarjar_resources.py --input-dir ../content/public/android/java/res --output-dir "$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_res" --rules-path ../android_webview/build/jarjar-rules.txt --stamp "$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp" + + + +GYP_GENERATED_OUTPUTS := \ + $(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_jarjar_content_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_jarjar_content_resources.target.darwin-x86_64.mk b/android_webview/android_webview_jarjar_content_resources.target.darwin-x86_64.mk new file mode 100644 index 0000000000..d589c7fb6c --- /dev/null +++ b/android_webview/android_webview_jarjar_content_resources.target.darwin-x86_64.mk @@ -0,0 +1,50 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_jarjar_content_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +### Rules for action "jarjar resources": +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: $(LOCAL_PATH)/build/android/gyp/util/build_utils.py $(LOCAL_PATH)/build/android/gyp/jarjar_resources.py $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/bubble.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/bubble.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/layout-land/date_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/date_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/multi_field_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/two_field_date_picker.xml $(LOCAL_PATH)/content/public/android/java/res/layout/validation_message_bubble.xml $(LOCAL_PATH)/content/public/android/java/res/menu/select_action_menu.xml $(LOCAL_PATH)/content/public/android/java/res/mipmap-hdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-mdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-xhdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-xxhdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/values-v17/styles.xml $(LOCAL_PATH)/content/public/android/java/res/values/attrs.xml $(LOCAL_PATH)/content/public/android/java/res/values/dimens.xml $(LOCAL_PATH)/content/public/android/java/res/values/strings.xml $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/bubble.9.png $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Copying and jar-jaring resources for android_webview_jarjar_content_resources ($@)" + $(hide)cd $(gyp_local_path)/android_webview; mkdir -p $(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources; python ../build/android/gyp/jarjar_resources.py --input-dir ../content/public/android/java/res --output-dir "$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_res" --rules-path ../android_webview/build/jarjar-rules.txt --stamp "$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp" + + + +GYP_GENERATED_OUTPUTS := \ + $(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_jarjar_content_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_jarjar_content_resources.target.linux-arm.mk b/android_webview/android_webview_jarjar_content_resources.target.linux-arm.mk new file mode 100644 index 0000000000..d589c7fb6c --- /dev/null +++ b/android_webview/android_webview_jarjar_content_resources.target.linux-arm.mk @@ -0,0 +1,50 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_jarjar_content_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +### Rules for action "jarjar resources": +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: $(LOCAL_PATH)/build/android/gyp/util/build_utils.py $(LOCAL_PATH)/build/android/gyp/jarjar_resources.py $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/bubble.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/bubble.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/layout-land/date_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/date_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/multi_field_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/two_field_date_picker.xml $(LOCAL_PATH)/content/public/android/java/res/layout/validation_message_bubble.xml $(LOCAL_PATH)/content/public/android/java/res/menu/select_action_menu.xml $(LOCAL_PATH)/content/public/android/java/res/mipmap-hdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-mdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-xhdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-xxhdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/values-v17/styles.xml $(LOCAL_PATH)/content/public/android/java/res/values/attrs.xml $(LOCAL_PATH)/content/public/android/java/res/values/dimens.xml $(LOCAL_PATH)/content/public/android/java/res/values/strings.xml $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/bubble.9.png $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Copying and jar-jaring resources for android_webview_jarjar_content_resources ($@)" + $(hide)cd $(gyp_local_path)/android_webview; mkdir -p $(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources; python ../build/android/gyp/jarjar_resources.py --input-dir ../content/public/android/java/res --output-dir "$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_res" --rules-path ../android_webview/build/jarjar-rules.txt --stamp "$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp" + + + +GYP_GENERATED_OUTPUTS := \ + $(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_jarjar_content_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_jarjar_content_resources.target.linux-arm64.mk b/android_webview/android_webview_jarjar_content_resources.target.linux-arm64.mk new file mode 100644 index 0000000000..d589c7fb6c --- /dev/null +++ b/android_webview/android_webview_jarjar_content_resources.target.linux-arm64.mk @@ -0,0 +1,50 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_jarjar_content_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +### Rules for action "jarjar resources": +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: $(LOCAL_PATH)/build/android/gyp/util/build_utils.py $(LOCAL_PATH)/build/android/gyp/jarjar_resources.py $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/bubble.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/bubble.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/layout-land/date_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/date_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/multi_field_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/two_field_date_picker.xml $(LOCAL_PATH)/content/public/android/java/res/layout/validation_message_bubble.xml $(LOCAL_PATH)/content/public/android/java/res/menu/select_action_menu.xml $(LOCAL_PATH)/content/public/android/java/res/mipmap-hdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-mdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-xhdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-xxhdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/values-v17/styles.xml $(LOCAL_PATH)/content/public/android/java/res/values/attrs.xml $(LOCAL_PATH)/content/public/android/java/res/values/dimens.xml $(LOCAL_PATH)/content/public/android/java/res/values/strings.xml $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/bubble.9.png $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Copying and jar-jaring resources for android_webview_jarjar_content_resources ($@)" + $(hide)cd $(gyp_local_path)/android_webview; mkdir -p $(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources; python ../build/android/gyp/jarjar_resources.py --input-dir ../content/public/android/java/res --output-dir "$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_res" --rules-path ../android_webview/build/jarjar-rules.txt --stamp "$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp" + + + +GYP_GENERATED_OUTPUTS := \ + $(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_jarjar_content_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_jarjar_content_resources.target.linux-mips.mk b/android_webview/android_webview_jarjar_content_resources.target.linux-mips.mk new file mode 100644 index 0000000000..d589c7fb6c --- /dev/null +++ b/android_webview/android_webview_jarjar_content_resources.target.linux-mips.mk @@ -0,0 +1,50 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_jarjar_content_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +### Rules for action "jarjar resources": +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: $(LOCAL_PATH)/build/android/gyp/util/build_utils.py $(LOCAL_PATH)/build/android/gyp/jarjar_resources.py $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/bubble.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/bubble.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/layout-land/date_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/date_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/multi_field_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/two_field_date_picker.xml $(LOCAL_PATH)/content/public/android/java/res/layout/validation_message_bubble.xml $(LOCAL_PATH)/content/public/android/java/res/menu/select_action_menu.xml $(LOCAL_PATH)/content/public/android/java/res/mipmap-hdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-mdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-xhdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-xxhdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/values-v17/styles.xml $(LOCAL_PATH)/content/public/android/java/res/values/attrs.xml $(LOCAL_PATH)/content/public/android/java/res/values/dimens.xml $(LOCAL_PATH)/content/public/android/java/res/values/strings.xml $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/bubble.9.png $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Copying and jar-jaring resources for android_webview_jarjar_content_resources ($@)" + $(hide)cd $(gyp_local_path)/android_webview; mkdir -p $(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources; python ../build/android/gyp/jarjar_resources.py --input-dir ../content/public/android/java/res --output-dir "$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_res" --rules-path ../android_webview/build/jarjar-rules.txt --stamp "$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp" + + + +GYP_GENERATED_OUTPUTS := \ + $(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_jarjar_content_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_jarjar_content_resources.target.linux-x86.mk b/android_webview/android_webview_jarjar_content_resources.target.linux-x86.mk new file mode 100644 index 0000000000..d589c7fb6c --- /dev/null +++ b/android_webview/android_webview_jarjar_content_resources.target.linux-x86.mk @@ -0,0 +1,50 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_jarjar_content_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +### Rules for action "jarjar resources": +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: $(LOCAL_PATH)/build/android/gyp/util/build_utils.py $(LOCAL_PATH)/build/android/gyp/jarjar_resources.py $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/bubble.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/bubble.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/layout-land/date_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/date_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/multi_field_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/two_field_date_picker.xml $(LOCAL_PATH)/content/public/android/java/res/layout/validation_message_bubble.xml $(LOCAL_PATH)/content/public/android/java/res/menu/select_action_menu.xml $(LOCAL_PATH)/content/public/android/java/res/mipmap-hdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-mdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-xhdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-xxhdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/values-v17/styles.xml $(LOCAL_PATH)/content/public/android/java/res/values/attrs.xml $(LOCAL_PATH)/content/public/android/java/res/values/dimens.xml $(LOCAL_PATH)/content/public/android/java/res/values/strings.xml $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/bubble.9.png $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Copying and jar-jaring resources for android_webview_jarjar_content_resources ($@)" + $(hide)cd $(gyp_local_path)/android_webview; mkdir -p $(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources; python ../build/android/gyp/jarjar_resources.py --input-dir ../content/public/android/java/res --output-dir "$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_res" --rules-path ../android_webview/build/jarjar-rules.txt --stamp "$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp" + + + +GYP_GENERATED_OUTPUTS := \ + $(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_jarjar_content_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_jarjar_content_resources.target.linux-x86_64.mk b/android_webview/android_webview_jarjar_content_resources.target.linux-x86_64.mk new file mode 100644 index 0000000000..d589c7fb6c --- /dev/null +++ b/android_webview/android_webview_jarjar_content_resources.target.linux-x86_64.mk @@ -0,0 +1,50 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_jarjar_content_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +### Rules for action "jarjar resources": +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp: $(LOCAL_PATH)/build/android/gyp/util/build_utils.py $(LOCAL_PATH)/build/android/gyp/jarjar_resources.py $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/bubble.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-hdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/bubble.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-xhdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/layout-land/date_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/date_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/multi_field_time_picker_dialog.xml $(LOCAL_PATH)/content/public/android/java/res/layout/two_field_date_picker.xml $(LOCAL_PATH)/content/public/android/java/res/layout/validation_message_bubble.xml $(LOCAL_PATH)/content/public/android/java/res/menu/select_action_menu.xml $(LOCAL_PATH)/content/public/android/java/res/mipmap-hdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-mdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-xhdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/mipmap-xxhdpi/app_icon.png $(LOCAL_PATH)/content/public/android/java/res/values-v17/styles.xml $(LOCAL_PATH)/content/public/android/java/res/values/attrs.xml $(LOCAL_PATH)/content/public/android/java/res/values/dimens.xml $(LOCAL_PATH)/content/public/android/java/res/values/strings.xml $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/pageinfo_warning_major.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ondemand_overlay.9.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ic_menu_share_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/ic_menu_search_holo_light.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/bubble_arrow_up.png $(LOCAL_PATH)/content/public/android/java/res/drawable-mdpi/bubble.9.png $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Copying and jar-jaring resources for android_webview_jarjar_content_resources ($@)" + $(hide)cd $(gyp_local_path)/android_webview; mkdir -p $(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources; python ../build/android/gyp/jarjar_resources.py --input-dir ../content/public/android/java/res --output-dir "$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_res" --rules-path ../android_webview/build/jarjar-rules.txt --stamp "$(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp" + + + +GYP_GENERATED_OUTPUTS := \ + $(gyp_shared_intermediate_dir)/android_webview_jarjar_content_resources/jarjar_resources.stamp + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_jarjar_content_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_jarjar_ui_resources.target.darwin-arm.mk b/android_webview/android_webview_jarjar_ui_resources.target.darwin-arm.mk new file mode 100644 index 0000000000..204cd16054 --- /dev/null +++ b/android_webview/android_webview_jarjar_ui_resources.target.darwin-arm.mk @@ -0,0 +1,50 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_jarjar_ui_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +### Rules for action "jarjar resources": +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: $(LOCAL_PATH)/build/android/gyp/util/build_utils.py $(LOCAL_PATH)/build/android/gyp/jarjar_resources.py $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable/color_button_background.xml $(LOCAL_PATH)/ui/android/java/res/drawable/color_picker_border.xml $(LOCAL_PATH)/ui/android/java/res/drawable/dropdown_popup_background.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_advanced_component.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_dialog_content.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_dialog_title.xml $(LOCAL_PATH)/ui/android/java/res/layout/date_time_suggestion.xml $(LOCAL_PATH)/ui/android/java/res/layout/dropdown_item.xml $(LOCAL_PATH)/ui/android/java/res/values-v17/styles.xml $(LOCAL_PATH)/ui/android/java/res/values/strings.xml $(LOCAL_PATH)/ui/android/java/res/values/colors.xml $(LOCAL_PATH)/ui/android/java/res/values/dimens.xml $(LOCAL_PATH)/ui/android/java/res/values/values.xml $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/color_picker_advanced_select_handle.png $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Copying and jar-jaring resources for android_webview_jarjar_ui_resources ($@)" + $(hide)cd $(gyp_local_path)/android_webview; mkdir -p $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources; python ../build/android/gyp/jarjar_resources.py --input-dir ../ui/android/java/res --output-dir "$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_res" --rules-path ../android_webview/build/jarjar-rules.txt --stamp "$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp" + + + +GYP_GENERATED_OUTPUTS := \ + $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_jarjar_ui_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_jarjar_ui_resources.target.darwin-arm64.mk b/android_webview/android_webview_jarjar_ui_resources.target.darwin-arm64.mk new file mode 100644 index 0000000000..204cd16054 --- /dev/null +++ b/android_webview/android_webview_jarjar_ui_resources.target.darwin-arm64.mk @@ -0,0 +1,50 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_jarjar_ui_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +### Rules for action "jarjar resources": +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: $(LOCAL_PATH)/build/android/gyp/util/build_utils.py $(LOCAL_PATH)/build/android/gyp/jarjar_resources.py $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable/color_button_background.xml $(LOCAL_PATH)/ui/android/java/res/drawable/color_picker_border.xml $(LOCAL_PATH)/ui/android/java/res/drawable/dropdown_popup_background.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_advanced_component.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_dialog_content.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_dialog_title.xml $(LOCAL_PATH)/ui/android/java/res/layout/date_time_suggestion.xml $(LOCAL_PATH)/ui/android/java/res/layout/dropdown_item.xml $(LOCAL_PATH)/ui/android/java/res/values-v17/styles.xml $(LOCAL_PATH)/ui/android/java/res/values/strings.xml $(LOCAL_PATH)/ui/android/java/res/values/colors.xml $(LOCAL_PATH)/ui/android/java/res/values/dimens.xml $(LOCAL_PATH)/ui/android/java/res/values/values.xml $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/color_picker_advanced_select_handle.png $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Copying and jar-jaring resources for android_webview_jarjar_ui_resources ($@)" + $(hide)cd $(gyp_local_path)/android_webview; mkdir -p $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources; python ../build/android/gyp/jarjar_resources.py --input-dir ../ui/android/java/res --output-dir "$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_res" --rules-path ../android_webview/build/jarjar-rules.txt --stamp "$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp" + + + +GYP_GENERATED_OUTPUTS := \ + $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_jarjar_ui_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_jarjar_ui_resources.target.darwin-mips.mk b/android_webview/android_webview_jarjar_ui_resources.target.darwin-mips.mk new file mode 100644 index 0000000000..204cd16054 --- /dev/null +++ b/android_webview/android_webview_jarjar_ui_resources.target.darwin-mips.mk @@ -0,0 +1,50 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_jarjar_ui_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +### Rules for action "jarjar resources": +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: $(LOCAL_PATH)/build/android/gyp/util/build_utils.py $(LOCAL_PATH)/build/android/gyp/jarjar_resources.py $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable/color_button_background.xml $(LOCAL_PATH)/ui/android/java/res/drawable/color_picker_border.xml $(LOCAL_PATH)/ui/android/java/res/drawable/dropdown_popup_background.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_advanced_component.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_dialog_content.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_dialog_title.xml $(LOCAL_PATH)/ui/android/java/res/layout/date_time_suggestion.xml $(LOCAL_PATH)/ui/android/java/res/layout/dropdown_item.xml $(LOCAL_PATH)/ui/android/java/res/values-v17/styles.xml $(LOCAL_PATH)/ui/android/java/res/values/strings.xml $(LOCAL_PATH)/ui/android/java/res/values/colors.xml $(LOCAL_PATH)/ui/android/java/res/values/dimens.xml $(LOCAL_PATH)/ui/android/java/res/values/values.xml $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/color_picker_advanced_select_handle.png $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Copying and jar-jaring resources for android_webview_jarjar_ui_resources ($@)" + $(hide)cd $(gyp_local_path)/android_webview; mkdir -p $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources; python ../build/android/gyp/jarjar_resources.py --input-dir ../ui/android/java/res --output-dir "$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_res" --rules-path ../android_webview/build/jarjar-rules.txt --stamp "$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp" + + + +GYP_GENERATED_OUTPUTS := \ + $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_jarjar_ui_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_jarjar_ui_resources.target.darwin-x86.mk b/android_webview/android_webview_jarjar_ui_resources.target.darwin-x86.mk new file mode 100644 index 0000000000..204cd16054 --- /dev/null +++ b/android_webview/android_webview_jarjar_ui_resources.target.darwin-x86.mk @@ -0,0 +1,50 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_jarjar_ui_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +### Rules for action "jarjar resources": +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: $(LOCAL_PATH)/build/android/gyp/util/build_utils.py $(LOCAL_PATH)/build/android/gyp/jarjar_resources.py $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable/color_button_background.xml $(LOCAL_PATH)/ui/android/java/res/drawable/color_picker_border.xml $(LOCAL_PATH)/ui/android/java/res/drawable/dropdown_popup_background.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_advanced_component.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_dialog_content.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_dialog_title.xml $(LOCAL_PATH)/ui/android/java/res/layout/date_time_suggestion.xml $(LOCAL_PATH)/ui/android/java/res/layout/dropdown_item.xml $(LOCAL_PATH)/ui/android/java/res/values-v17/styles.xml $(LOCAL_PATH)/ui/android/java/res/values/strings.xml $(LOCAL_PATH)/ui/android/java/res/values/colors.xml $(LOCAL_PATH)/ui/android/java/res/values/dimens.xml $(LOCAL_PATH)/ui/android/java/res/values/values.xml $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/color_picker_advanced_select_handle.png $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Copying and jar-jaring resources for android_webview_jarjar_ui_resources ($@)" + $(hide)cd $(gyp_local_path)/android_webview; mkdir -p $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources; python ../build/android/gyp/jarjar_resources.py --input-dir ../ui/android/java/res --output-dir "$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_res" --rules-path ../android_webview/build/jarjar-rules.txt --stamp "$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp" + + + +GYP_GENERATED_OUTPUTS := \ + $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_jarjar_ui_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_jarjar_ui_resources.target.darwin-x86_64.mk b/android_webview/android_webview_jarjar_ui_resources.target.darwin-x86_64.mk new file mode 100644 index 0000000000..204cd16054 --- /dev/null +++ b/android_webview/android_webview_jarjar_ui_resources.target.darwin-x86_64.mk @@ -0,0 +1,50 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_jarjar_ui_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +### Rules for action "jarjar resources": +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: $(LOCAL_PATH)/build/android/gyp/util/build_utils.py $(LOCAL_PATH)/build/android/gyp/jarjar_resources.py $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable/color_button_background.xml $(LOCAL_PATH)/ui/android/java/res/drawable/color_picker_border.xml $(LOCAL_PATH)/ui/android/java/res/drawable/dropdown_popup_background.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_advanced_component.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_dialog_content.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_dialog_title.xml $(LOCAL_PATH)/ui/android/java/res/layout/date_time_suggestion.xml $(LOCAL_PATH)/ui/android/java/res/layout/dropdown_item.xml $(LOCAL_PATH)/ui/android/java/res/values-v17/styles.xml $(LOCAL_PATH)/ui/android/java/res/values/strings.xml $(LOCAL_PATH)/ui/android/java/res/values/colors.xml $(LOCAL_PATH)/ui/android/java/res/values/dimens.xml $(LOCAL_PATH)/ui/android/java/res/values/values.xml $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/color_picker_advanced_select_handle.png $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Copying and jar-jaring resources for android_webview_jarjar_ui_resources ($@)" + $(hide)cd $(gyp_local_path)/android_webview; mkdir -p $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources; python ../build/android/gyp/jarjar_resources.py --input-dir ../ui/android/java/res --output-dir "$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_res" --rules-path ../android_webview/build/jarjar-rules.txt --stamp "$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp" + + + +GYP_GENERATED_OUTPUTS := \ + $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_jarjar_ui_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_jarjar_ui_resources.target.linux-arm.mk b/android_webview/android_webview_jarjar_ui_resources.target.linux-arm.mk new file mode 100644 index 0000000000..204cd16054 --- /dev/null +++ b/android_webview/android_webview_jarjar_ui_resources.target.linux-arm.mk @@ -0,0 +1,50 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_jarjar_ui_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +### Rules for action "jarjar resources": +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: $(LOCAL_PATH)/build/android/gyp/util/build_utils.py $(LOCAL_PATH)/build/android/gyp/jarjar_resources.py $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable/color_button_background.xml $(LOCAL_PATH)/ui/android/java/res/drawable/color_picker_border.xml $(LOCAL_PATH)/ui/android/java/res/drawable/dropdown_popup_background.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_advanced_component.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_dialog_content.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_dialog_title.xml $(LOCAL_PATH)/ui/android/java/res/layout/date_time_suggestion.xml $(LOCAL_PATH)/ui/android/java/res/layout/dropdown_item.xml $(LOCAL_PATH)/ui/android/java/res/values-v17/styles.xml $(LOCAL_PATH)/ui/android/java/res/values/strings.xml $(LOCAL_PATH)/ui/android/java/res/values/colors.xml $(LOCAL_PATH)/ui/android/java/res/values/dimens.xml $(LOCAL_PATH)/ui/android/java/res/values/values.xml $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/color_picker_advanced_select_handle.png $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Copying and jar-jaring resources for android_webview_jarjar_ui_resources ($@)" + $(hide)cd $(gyp_local_path)/android_webview; mkdir -p $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources; python ../build/android/gyp/jarjar_resources.py --input-dir ../ui/android/java/res --output-dir "$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_res" --rules-path ../android_webview/build/jarjar-rules.txt --stamp "$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp" + + + +GYP_GENERATED_OUTPUTS := \ + $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_jarjar_ui_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_jarjar_ui_resources.target.linux-arm64.mk b/android_webview/android_webview_jarjar_ui_resources.target.linux-arm64.mk new file mode 100644 index 0000000000..204cd16054 --- /dev/null +++ b/android_webview/android_webview_jarjar_ui_resources.target.linux-arm64.mk @@ -0,0 +1,50 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_jarjar_ui_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +### Rules for action "jarjar resources": +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: $(LOCAL_PATH)/build/android/gyp/util/build_utils.py $(LOCAL_PATH)/build/android/gyp/jarjar_resources.py $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable/color_button_background.xml $(LOCAL_PATH)/ui/android/java/res/drawable/color_picker_border.xml $(LOCAL_PATH)/ui/android/java/res/drawable/dropdown_popup_background.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_advanced_component.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_dialog_content.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_dialog_title.xml $(LOCAL_PATH)/ui/android/java/res/layout/date_time_suggestion.xml $(LOCAL_PATH)/ui/android/java/res/layout/dropdown_item.xml $(LOCAL_PATH)/ui/android/java/res/values-v17/styles.xml $(LOCAL_PATH)/ui/android/java/res/values/strings.xml $(LOCAL_PATH)/ui/android/java/res/values/colors.xml $(LOCAL_PATH)/ui/android/java/res/values/dimens.xml $(LOCAL_PATH)/ui/android/java/res/values/values.xml $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/color_picker_advanced_select_handle.png $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Copying and jar-jaring resources for android_webview_jarjar_ui_resources ($@)" + $(hide)cd $(gyp_local_path)/android_webview; mkdir -p $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources; python ../build/android/gyp/jarjar_resources.py --input-dir ../ui/android/java/res --output-dir "$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_res" --rules-path ../android_webview/build/jarjar-rules.txt --stamp "$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp" + + + +GYP_GENERATED_OUTPUTS := \ + $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_jarjar_ui_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_jarjar_ui_resources.target.linux-mips.mk b/android_webview/android_webview_jarjar_ui_resources.target.linux-mips.mk new file mode 100644 index 0000000000..204cd16054 --- /dev/null +++ b/android_webview/android_webview_jarjar_ui_resources.target.linux-mips.mk @@ -0,0 +1,50 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_jarjar_ui_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +### Rules for action "jarjar resources": +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: $(LOCAL_PATH)/build/android/gyp/util/build_utils.py $(LOCAL_PATH)/build/android/gyp/jarjar_resources.py $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable/color_button_background.xml $(LOCAL_PATH)/ui/android/java/res/drawable/color_picker_border.xml $(LOCAL_PATH)/ui/android/java/res/drawable/dropdown_popup_background.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_advanced_component.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_dialog_content.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_dialog_title.xml $(LOCAL_PATH)/ui/android/java/res/layout/date_time_suggestion.xml $(LOCAL_PATH)/ui/android/java/res/layout/dropdown_item.xml $(LOCAL_PATH)/ui/android/java/res/values-v17/styles.xml $(LOCAL_PATH)/ui/android/java/res/values/strings.xml $(LOCAL_PATH)/ui/android/java/res/values/colors.xml $(LOCAL_PATH)/ui/android/java/res/values/dimens.xml $(LOCAL_PATH)/ui/android/java/res/values/values.xml $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/color_picker_advanced_select_handle.png $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Copying and jar-jaring resources for android_webview_jarjar_ui_resources ($@)" + $(hide)cd $(gyp_local_path)/android_webview; mkdir -p $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources; python ../build/android/gyp/jarjar_resources.py --input-dir ../ui/android/java/res --output-dir "$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_res" --rules-path ../android_webview/build/jarjar-rules.txt --stamp "$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp" + + + +GYP_GENERATED_OUTPUTS := \ + $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_jarjar_ui_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_jarjar_ui_resources.target.linux-x86.mk b/android_webview/android_webview_jarjar_ui_resources.target.linux-x86.mk new file mode 100644 index 0000000000..204cd16054 --- /dev/null +++ b/android_webview/android_webview_jarjar_ui_resources.target.linux-x86.mk @@ -0,0 +1,50 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_jarjar_ui_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +### Rules for action "jarjar resources": +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: $(LOCAL_PATH)/build/android/gyp/util/build_utils.py $(LOCAL_PATH)/build/android/gyp/jarjar_resources.py $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable/color_button_background.xml $(LOCAL_PATH)/ui/android/java/res/drawable/color_picker_border.xml $(LOCAL_PATH)/ui/android/java/res/drawable/dropdown_popup_background.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_advanced_component.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_dialog_content.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_dialog_title.xml $(LOCAL_PATH)/ui/android/java/res/layout/date_time_suggestion.xml $(LOCAL_PATH)/ui/android/java/res/layout/dropdown_item.xml $(LOCAL_PATH)/ui/android/java/res/values-v17/styles.xml $(LOCAL_PATH)/ui/android/java/res/values/strings.xml $(LOCAL_PATH)/ui/android/java/res/values/colors.xml $(LOCAL_PATH)/ui/android/java/res/values/dimens.xml $(LOCAL_PATH)/ui/android/java/res/values/values.xml $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/color_picker_advanced_select_handle.png $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Copying and jar-jaring resources for android_webview_jarjar_ui_resources ($@)" + $(hide)cd $(gyp_local_path)/android_webview; mkdir -p $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources; python ../build/android/gyp/jarjar_resources.py --input-dir ../ui/android/java/res --output-dir "$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_res" --rules-path ../android_webview/build/jarjar-rules.txt --stamp "$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp" + + + +GYP_GENERATED_OUTPUTS := \ + $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_jarjar_ui_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_jarjar_ui_resources.target.linux-x86_64.mk b/android_webview/android_webview_jarjar_ui_resources.target.linux-x86_64.mk new file mode 100644 index 0000000000..204cd16054 --- /dev/null +++ b/android_webview/android_webview_jarjar_ui_resources.target.linux-x86_64.mk @@ -0,0 +1,50 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_jarjar_ui_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +### Rules for action "jarjar resources": +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp: $(LOCAL_PATH)/build/android/gyp/util/build_utils.py $(LOCAL_PATH)/build/android/gyp/jarjar_resources.py $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-hdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/color_picker_advanced_select_handle.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-xhdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable/color_button_background.xml $(LOCAL_PATH)/ui/android/java/res/drawable/color_picker_border.xml $(LOCAL_PATH)/ui/android/java/res/drawable/dropdown_popup_background.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_advanced_component.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_dialog_content.xml $(LOCAL_PATH)/ui/android/java/res/layout/color_picker_dialog_title.xml $(LOCAL_PATH)/ui/android/java/res/layout/date_time_suggestion.xml $(LOCAL_PATH)/ui/android/java/res/layout/dropdown_item.xml $(LOCAL_PATH)/ui/android/java/res/values-v17/styles.xml $(LOCAL_PATH)/ui/android/java/res/values/strings.xml $(LOCAL_PATH)/ui/android/java/res/values/colors.xml $(LOCAL_PATH)/ui/android/java/res/values/dimens.xml $(LOCAL_PATH)/ui/android/java/res/values/values.xml $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/dropdown_popup_background_up.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/dropdown_popup_background_down.9.png $(LOCAL_PATH)/ui/android/java/res/drawable-mdpi/color_picker_advanced_select_handle.png $(GYP_TARGET_DEPENDENCIES) + @echo "Gyp action: Copying and jar-jaring resources for android_webview_jarjar_ui_resources ($@)" + $(hide)cd $(gyp_local_path)/android_webview; mkdir -p $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources; python ../build/android/gyp/jarjar_resources.py --input-dir ../ui/android/java/res --output-dir "$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_res" --rules-path ../android_webview/build/jarjar-rules.txt --stamp "$(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp" + + + +GYP_GENERATED_OUTPUTS := \ + $(gyp_shared_intermediate_dir)/android_webview_jarjar_ui_resources/jarjar_resources.stamp + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_jarjar_ui_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_strings.target.darwin-arm.mk b/android_webview/android_webview_resources.target.darwin-arm.mk index a70971bf12..36508589e2 100644 --- a/android_webview/android_webview_strings.target.darwin-arm.mk +++ b/android_webview/android_webview_resources.target.darwin-arm.mk @@ -3,7 +3,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := GYP -LOCAL_MODULE := android_webview_strings +LOCAL_MODULE := android_webview_resources LOCAL_MODULE_SUFFIX := .stamp LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) @@ -12,8 +12,10 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_V # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,content_content_strings_grd_gyp,,,$(GYP_VAR_PREFIX))/content_strings_grd.stamp \ - $(call intermediates-dir-for,GYP,ui_android_ui_strings_grd_gyp,,,$(GYP_VAR_PREFIX))/ui_strings_grd.stamp + $(call intermediates-dir-for,GYP,content_strings_grd,,,$(GYP_VAR_PREFIX))/content_strings_grd.stamp \ + $(call intermediates-dir-for,GYP,ui_strings_grd,,,$(GYP_VAR_PREFIX))/ui_strings_grd.stamp \ + $(call intermediates-dir-for,GYP,android_webview_jarjar_ui_resources,,,$(GYP_VAR_PREFIX))/android_webview_jarjar_ui_resources.stamp \ + $(call intermediates-dir-for,GYP,android_webview_jarjar_content_resources,,,$(GYP_VAR_PREFIX))/android_webview_jarjar_content_resources.stamp GYP_GENERATED_OUTPUTS := @@ -23,7 +25,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTP ### Rules for final target. # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules -gyp_all_modules: android_webview_strings +gyp_all_modules: android_webview_resources LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp LOCAL_UNINSTALLABLE_MODULE := true diff --git a/android_webview/android_webview_strings.target.darwin-arm64.mk b/android_webview/android_webview_resources.target.darwin-arm64.mk index a70971bf12..36508589e2 100644 --- a/android_webview/android_webview_strings.target.darwin-arm64.mk +++ b/android_webview/android_webview_resources.target.darwin-arm64.mk @@ -3,7 +3,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := GYP -LOCAL_MODULE := android_webview_strings +LOCAL_MODULE := android_webview_resources LOCAL_MODULE_SUFFIX := .stamp LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) @@ -12,8 +12,10 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_V # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,content_content_strings_grd_gyp,,,$(GYP_VAR_PREFIX))/content_strings_grd.stamp \ - $(call intermediates-dir-for,GYP,ui_android_ui_strings_grd_gyp,,,$(GYP_VAR_PREFIX))/ui_strings_grd.stamp + $(call intermediates-dir-for,GYP,content_strings_grd,,,$(GYP_VAR_PREFIX))/content_strings_grd.stamp \ + $(call intermediates-dir-for,GYP,ui_strings_grd,,,$(GYP_VAR_PREFIX))/ui_strings_grd.stamp \ + $(call intermediates-dir-for,GYP,android_webview_jarjar_ui_resources,,,$(GYP_VAR_PREFIX))/android_webview_jarjar_ui_resources.stamp \ + $(call intermediates-dir-for,GYP,android_webview_jarjar_content_resources,,,$(GYP_VAR_PREFIX))/android_webview_jarjar_content_resources.stamp GYP_GENERATED_OUTPUTS := @@ -23,7 +25,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTP ### Rules for final target. # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules -gyp_all_modules: android_webview_strings +gyp_all_modules: android_webview_resources LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp LOCAL_UNINSTALLABLE_MODULE := true diff --git a/android_webview/android_webview_strings.target.darwin-mips.mk b/android_webview/android_webview_resources.target.darwin-mips.mk index a70971bf12..36508589e2 100644 --- a/android_webview/android_webview_strings.target.darwin-mips.mk +++ b/android_webview/android_webview_resources.target.darwin-mips.mk @@ -3,7 +3,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := GYP -LOCAL_MODULE := android_webview_strings +LOCAL_MODULE := android_webview_resources LOCAL_MODULE_SUFFIX := .stamp LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) @@ -12,8 +12,10 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_V # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,content_content_strings_grd_gyp,,,$(GYP_VAR_PREFIX))/content_strings_grd.stamp \ - $(call intermediates-dir-for,GYP,ui_android_ui_strings_grd_gyp,,,$(GYP_VAR_PREFIX))/ui_strings_grd.stamp + $(call intermediates-dir-for,GYP,content_strings_grd,,,$(GYP_VAR_PREFIX))/content_strings_grd.stamp \ + $(call intermediates-dir-for,GYP,ui_strings_grd,,,$(GYP_VAR_PREFIX))/ui_strings_grd.stamp \ + $(call intermediates-dir-for,GYP,android_webview_jarjar_ui_resources,,,$(GYP_VAR_PREFIX))/android_webview_jarjar_ui_resources.stamp \ + $(call intermediates-dir-for,GYP,android_webview_jarjar_content_resources,,,$(GYP_VAR_PREFIX))/android_webview_jarjar_content_resources.stamp GYP_GENERATED_OUTPUTS := @@ -23,7 +25,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTP ### Rules for final target. # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules -gyp_all_modules: android_webview_strings +gyp_all_modules: android_webview_resources LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp LOCAL_UNINSTALLABLE_MODULE := true diff --git a/android_webview/android_webview_strings.target.darwin-x86.mk b/android_webview/android_webview_resources.target.darwin-x86.mk index a70971bf12..36508589e2 100644 --- a/android_webview/android_webview_strings.target.darwin-x86.mk +++ b/android_webview/android_webview_resources.target.darwin-x86.mk @@ -3,7 +3,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := GYP -LOCAL_MODULE := android_webview_strings +LOCAL_MODULE := android_webview_resources LOCAL_MODULE_SUFFIX := .stamp LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) @@ -12,8 +12,10 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_V # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,content_content_strings_grd_gyp,,,$(GYP_VAR_PREFIX))/content_strings_grd.stamp \ - $(call intermediates-dir-for,GYP,ui_android_ui_strings_grd_gyp,,,$(GYP_VAR_PREFIX))/ui_strings_grd.stamp + $(call intermediates-dir-for,GYP,content_strings_grd,,,$(GYP_VAR_PREFIX))/content_strings_grd.stamp \ + $(call intermediates-dir-for,GYP,ui_strings_grd,,,$(GYP_VAR_PREFIX))/ui_strings_grd.stamp \ + $(call intermediates-dir-for,GYP,android_webview_jarjar_ui_resources,,,$(GYP_VAR_PREFIX))/android_webview_jarjar_ui_resources.stamp \ + $(call intermediates-dir-for,GYP,android_webview_jarjar_content_resources,,,$(GYP_VAR_PREFIX))/android_webview_jarjar_content_resources.stamp GYP_GENERATED_OUTPUTS := @@ -23,7 +25,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTP ### Rules for final target. # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules -gyp_all_modules: android_webview_strings +gyp_all_modules: android_webview_resources LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp LOCAL_UNINSTALLABLE_MODULE := true diff --git a/android_webview/android_webview_resources.target.darwin-x86_64.mk b/android_webview/android_webview_resources.target.darwin-x86_64.mk new file mode 100644 index 0000000000..36508589e2 --- /dev/null +++ b/android_webview/android_webview_resources.target.darwin-x86_64.mk @@ -0,0 +1,41 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := \ + $(call intermediates-dir-for,GYP,content_strings_grd,,,$(GYP_VAR_PREFIX))/content_strings_grd.stamp \ + $(call intermediates-dir-for,GYP,ui_strings_grd,,,$(GYP_VAR_PREFIX))/ui_strings_grd.stamp \ + $(call intermediates-dir-for,GYP,android_webview_jarjar_ui_resources,,,$(GYP_VAR_PREFIX))/android_webview_jarjar_ui_resources.stamp \ + $(call intermediates-dir-for,GYP,android_webview_jarjar_content_resources,,,$(GYP_VAR_PREFIX))/android_webview_jarjar_content_resources.stamp + +GYP_GENERATED_OUTPUTS := + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_resources.target.linux-arm.mk b/android_webview/android_webview_resources.target.linux-arm.mk new file mode 100644 index 0000000000..36508589e2 --- /dev/null +++ b/android_webview/android_webview_resources.target.linux-arm.mk @@ -0,0 +1,41 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := \ + $(call intermediates-dir-for,GYP,content_strings_grd,,,$(GYP_VAR_PREFIX))/content_strings_grd.stamp \ + $(call intermediates-dir-for,GYP,ui_strings_grd,,,$(GYP_VAR_PREFIX))/ui_strings_grd.stamp \ + $(call intermediates-dir-for,GYP,android_webview_jarjar_ui_resources,,,$(GYP_VAR_PREFIX))/android_webview_jarjar_ui_resources.stamp \ + $(call intermediates-dir-for,GYP,android_webview_jarjar_content_resources,,,$(GYP_VAR_PREFIX))/android_webview_jarjar_content_resources.stamp + +GYP_GENERATED_OUTPUTS := + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_resources.target.linux-arm64.mk b/android_webview/android_webview_resources.target.linux-arm64.mk new file mode 100644 index 0000000000..36508589e2 --- /dev/null +++ b/android_webview/android_webview_resources.target.linux-arm64.mk @@ -0,0 +1,41 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := \ + $(call intermediates-dir-for,GYP,content_strings_grd,,,$(GYP_VAR_PREFIX))/content_strings_grd.stamp \ + $(call intermediates-dir-for,GYP,ui_strings_grd,,,$(GYP_VAR_PREFIX))/ui_strings_grd.stamp \ + $(call intermediates-dir-for,GYP,android_webview_jarjar_ui_resources,,,$(GYP_VAR_PREFIX))/android_webview_jarjar_ui_resources.stamp \ + $(call intermediates-dir-for,GYP,android_webview_jarjar_content_resources,,,$(GYP_VAR_PREFIX))/android_webview_jarjar_content_resources.stamp + +GYP_GENERATED_OUTPUTS := + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_resources.target.linux-mips.mk b/android_webview/android_webview_resources.target.linux-mips.mk new file mode 100644 index 0000000000..36508589e2 --- /dev/null +++ b/android_webview/android_webview_resources.target.linux-mips.mk @@ -0,0 +1,41 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := \ + $(call intermediates-dir-for,GYP,content_strings_grd,,,$(GYP_VAR_PREFIX))/content_strings_grd.stamp \ + $(call intermediates-dir-for,GYP,ui_strings_grd,,,$(GYP_VAR_PREFIX))/ui_strings_grd.stamp \ + $(call intermediates-dir-for,GYP,android_webview_jarjar_ui_resources,,,$(GYP_VAR_PREFIX))/android_webview_jarjar_ui_resources.stamp \ + $(call intermediates-dir-for,GYP,android_webview_jarjar_content_resources,,,$(GYP_VAR_PREFIX))/android_webview_jarjar_content_resources.stamp + +GYP_GENERATED_OUTPUTS := + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_resources.target.linux-x86.mk b/android_webview/android_webview_resources.target.linux-x86.mk new file mode 100644 index 0000000000..36508589e2 --- /dev/null +++ b/android_webview/android_webview_resources.target.linux-x86.mk @@ -0,0 +1,41 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := \ + $(call intermediates-dir-for,GYP,content_strings_grd,,,$(GYP_VAR_PREFIX))/content_strings_grd.stamp \ + $(call intermediates-dir-for,GYP,ui_strings_grd,,,$(GYP_VAR_PREFIX))/ui_strings_grd.stamp \ + $(call intermediates-dir-for,GYP,android_webview_jarjar_ui_resources,,,$(GYP_VAR_PREFIX))/android_webview_jarjar_ui_resources.stamp \ + $(call intermediates-dir-for,GYP,android_webview_jarjar_content_resources,,,$(GYP_VAR_PREFIX))/android_webview_jarjar_content_resources.stamp + +GYP_GENERATED_OUTPUTS := + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_resources.target.linux-x86_64.mk b/android_webview/android_webview_resources.target.linux-x86_64.mk new file mode 100644 index 0000000000..36508589e2 --- /dev/null +++ b/android_webview/android_webview_resources.target.linux-x86_64.mk @@ -0,0 +1,41 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := android_webview_resources +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := \ + $(call intermediates-dir-for,GYP,content_strings_grd,,,$(GYP_VAR_PREFIX))/content_strings_grd.stamp \ + $(call intermediates-dir-for,GYP,ui_strings_grd,,,$(GYP_VAR_PREFIX))/ui_strings_grd.stamp \ + $(call intermediates-dir-for,GYP,android_webview_jarjar_ui_resources,,,$(GYP_VAR_PREFIX))/android_webview_jarjar_ui_resources.stamp \ + $(call intermediates-dir-for,GYP,android_webview_jarjar_content_resources,,,$(GYP_VAR_PREFIX))/android_webview_jarjar_content_resources.stamp + +GYP_GENERATED_OUTPUTS := + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: android_webview_resources + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true +LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_strings.target.darwin-x86_64.mk b/android_webview/android_webview_strings.target.darwin-x86_64.mk deleted file mode 100644 index a70971bf12..0000000000 --- a/android_webview/android_webview_strings.target.darwin-x86_64.mk +++ /dev/null @@ -1,39 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := GYP -LOCAL_MODULE := android_webview_strings -LOCAL_MODULE_SUFFIX := .stamp -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,content_content_strings_grd_gyp,,,$(GYP_VAR_PREFIX))/content_strings_grd.stamp \ - $(call intermediates-dir-for,GYP,ui_android_ui_strings_grd_gyp,,,$(GYP_VAR_PREFIX))/ui_strings_grd.stamp - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -### Rules for final target. -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: android_webview_strings - -LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp -LOCAL_UNINSTALLABLE_MODULE := true -LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) - -include $(BUILD_SYSTEM)/base_rules.mk - -$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) - $(hide) echo "Gyp timestamp: $@" - $(hide) mkdir -p $(dir $@) - $(hide) touch $@ - -LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_strings.target.linux-arm.mk b/android_webview/android_webview_strings.target.linux-arm.mk deleted file mode 100644 index a70971bf12..0000000000 --- a/android_webview/android_webview_strings.target.linux-arm.mk +++ /dev/null @@ -1,39 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := GYP -LOCAL_MODULE := android_webview_strings -LOCAL_MODULE_SUFFIX := .stamp -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,content_content_strings_grd_gyp,,,$(GYP_VAR_PREFIX))/content_strings_grd.stamp \ - $(call intermediates-dir-for,GYP,ui_android_ui_strings_grd_gyp,,,$(GYP_VAR_PREFIX))/ui_strings_grd.stamp - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -### Rules for final target. -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: android_webview_strings - -LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp -LOCAL_UNINSTALLABLE_MODULE := true -LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) - -include $(BUILD_SYSTEM)/base_rules.mk - -$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) - $(hide) echo "Gyp timestamp: $@" - $(hide) mkdir -p $(dir $@) - $(hide) touch $@ - -LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_strings.target.linux-arm64.mk b/android_webview/android_webview_strings.target.linux-arm64.mk deleted file mode 100644 index a70971bf12..0000000000 --- a/android_webview/android_webview_strings.target.linux-arm64.mk +++ /dev/null @@ -1,39 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := GYP -LOCAL_MODULE := android_webview_strings -LOCAL_MODULE_SUFFIX := .stamp -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,content_content_strings_grd_gyp,,,$(GYP_VAR_PREFIX))/content_strings_grd.stamp \ - $(call intermediates-dir-for,GYP,ui_android_ui_strings_grd_gyp,,,$(GYP_VAR_PREFIX))/ui_strings_grd.stamp - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -### Rules for final target. -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: android_webview_strings - -LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp -LOCAL_UNINSTALLABLE_MODULE := true -LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) - -include $(BUILD_SYSTEM)/base_rules.mk - -$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) - $(hide) echo "Gyp timestamp: $@" - $(hide) mkdir -p $(dir $@) - $(hide) touch $@ - -LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_strings.target.linux-mips.mk b/android_webview/android_webview_strings.target.linux-mips.mk deleted file mode 100644 index a70971bf12..0000000000 --- a/android_webview/android_webview_strings.target.linux-mips.mk +++ /dev/null @@ -1,39 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := GYP -LOCAL_MODULE := android_webview_strings -LOCAL_MODULE_SUFFIX := .stamp -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,content_content_strings_grd_gyp,,,$(GYP_VAR_PREFIX))/content_strings_grd.stamp \ - $(call intermediates-dir-for,GYP,ui_android_ui_strings_grd_gyp,,,$(GYP_VAR_PREFIX))/ui_strings_grd.stamp - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -### Rules for final target. -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: android_webview_strings - -LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp -LOCAL_UNINSTALLABLE_MODULE := true -LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) - -include $(BUILD_SYSTEM)/base_rules.mk - -$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) - $(hide) echo "Gyp timestamp: $@" - $(hide) mkdir -p $(dir $@) - $(hide) touch $@ - -LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_strings.target.linux-x86.mk b/android_webview/android_webview_strings.target.linux-x86.mk deleted file mode 100644 index a70971bf12..0000000000 --- a/android_webview/android_webview_strings.target.linux-x86.mk +++ /dev/null @@ -1,39 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := GYP -LOCAL_MODULE := android_webview_strings -LOCAL_MODULE_SUFFIX := .stamp -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,content_content_strings_grd_gyp,,,$(GYP_VAR_PREFIX))/content_strings_grd.stamp \ - $(call intermediates-dir-for,GYP,ui_android_ui_strings_grd_gyp,,,$(GYP_VAR_PREFIX))/ui_strings_grd.stamp - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -### Rules for final target. -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: android_webview_strings - -LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp -LOCAL_UNINSTALLABLE_MODULE := true -LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) - -include $(BUILD_SYSTEM)/base_rules.mk - -$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) - $(hide) echo "Gyp timestamp: $@" - $(hide) mkdir -p $(dir $@) - $(hide) touch $@ - -LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/android_webview_strings.target.linux-x86_64.mk b/android_webview/android_webview_strings.target.linux-x86_64.mk deleted file mode 100644 index a70971bf12..0000000000 --- a/android_webview/android_webview_strings.target.linux-x86_64.mk +++ /dev/null @@ -1,39 +0,0 @@ -# This file is generated by gyp; do not edit. - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := GYP -LOCAL_MODULE := android_webview_strings -LOCAL_MODULE_SUFFIX := .stamp -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) - -# Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,content_content_strings_grd_gyp,,,$(GYP_VAR_PREFIX))/content_strings_grd.stamp \ - $(call intermediates-dir-for,GYP,ui_android_ui_strings_grd_gyp,,,$(GYP_VAR_PREFIX))/ui_strings_grd.stamp - -GYP_GENERATED_OUTPUTS := - -# Make sure our deps and generated files are built first. -LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) - -### Rules for final target. -# Add target alias to "gyp_all_modules" target. -.PHONY: gyp_all_modules -gyp_all_modules: android_webview_strings - -LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp -LOCAL_UNINSTALLABLE_MODULE := true -LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX) - -include $(BUILD_SYSTEM)/base_rules.mk - -$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) - $(hide) echo "Gyp timestamp: $@" - $(hide) mkdir -p $(dir $@) - $(hide) touch $@ - -LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/android_webview/browser/aw_contents_io_thread_client.h b/android_webview/browser/aw_contents_io_thread_client.h index 0ac29fcb46..cb8bc26d19 100644 --- a/android_webview/browser/aw_contents_io_thread_client.h +++ b/android_webview/browser/aw_contents_io_thread_client.h @@ -17,7 +17,7 @@ class URLRequest; namespace android_webview { -class InterceptedRequestData; +class AwWebResourceResponse; // This class provides a means of calling Java methods on an instance that has // a 1:1 relationship with a WebContents instance directly from the IO thread. @@ -68,7 +68,7 @@ class AwContentsIoThreadClient { int child_render_frame_id); // This method is called on the IO thread only. - virtual scoped_ptr<InterceptedRequestData> ShouldInterceptRequest( + virtual scoped_ptr<AwWebResourceResponse> ShouldInterceptRequest( const GURL& location, const net::URLRequest* request) = 0; diff --git a/android_webview/browser/aw_request_interceptor.cc b/android_webview/browser/aw_request_interceptor.cc index a53061b684..381a8ab03c 100644 --- a/android_webview/browser/aw_request_interceptor.cc +++ b/android_webview/browser/aw_request_interceptor.cc @@ -5,7 +5,7 @@ #include "android_webview/browser/aw_request_interceptor.h" #include "android_webview/browser/aw_contents_io_thread_client.h" -#include "android_webview/browser/intercepted_request_data.h" +#include "android_webview/browser/aw_web_resource_response.h" #include "base/android/jni_string.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/browser_thread.h" @@ -34,21 +34,21 @@ AwRequestInterceptor::AwRequestInterceptor() { AwRequestInterceptor::~AwRequestInterceptor() { } -scoped_ptr<InterceptedRequestData> -AwRequestInterceptor::QueryForInterceptedRequestData( +scoped_ptr<AwWebResourceResponse> +AwRequestInterceptor::QueryForAwWebResourceResponse( const GURL& location, net::URLRequest* request) const { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); int render_process_id, render_frame_id; if (!ResourceRequestInfo::GetRenderFrameForRequest( request, &render_process_id, &render_frame_id)) - return scoped_ptr<InterceptedRequestData>(); + return scoped_ptr<AwWebResourceResponse>(); scoped_ptr<AwContentsIoThreadClient> io_thread_client = AwContentsIoThreadClient::FromID(render_process_id, render_frame_id); if (!io_thread_client.get()) - return scoped_ptr<InterceptedRequestData>(); + return scoped_ptr<AwWebResourceResponse>(); return io_thread_client->ShouldInterceptRequest(location, request).Pass(); } @@ -58,7 +58,7 @@ net::URLRequestJob* AwRequestInterceptor::MaybeInterceptRequest( net::NetworkDelegate* network_delegate) const { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); - // See if we've already found out the intercepted_request_data for this + // See if we've already found out the aw_web_resource_response for this // request. // This is done not only for efficiency reasons, but also for correctness // as it is possible for the Interceptor chain to be invoked more than once @@ -70,15 +70,15 @@ net::URLRequestJob* AwRequestInterceptor::MaybeInterceptRequest( request->SetUserData(kRequestAlreadyQueriedDataKey, new base::SupportsUserData::Data()); - scoped_ptr<InterceptedRequestData> intercepted_request_data = - QueryForInterceptedRequestData(request->url(), request); + scoped_ptr<AwWebResourceResponse> aw_web_resource_response = + QueryForAwWebResourceResponse(request->url(), request); - if (!intercepted_request_data) + if (!aw_web_resource_response) return NULL; - // The newly created job will own the InterceptedRequestData. - return InterceptedRequestData::CreateJobFor( - intercepted_request_data.Pass(), request, network_delegate); + // The newly created job will own the AwWebResourceResponse. + return AwWebResourceResponse::CreateJobFor( + aw_web_resource_response.Pass(), request, network_delegate); } } // namespace android_webview diff --git a/android_webview/browser/aw_request_interceptor.h b/android_webview/browser/aw_request_interceptor.h index b83ab32e23..813abbe8f4 100644 --- a/android_webview/browser/aw_request_interceptor.h +++ b/android_webview/browser/aw_request_interceptor.h @@ -19,7 +19,7 @@ class NetworkDelegate; namespace android_webview { -class InterceptedRequestData; +class AwWebResourceResponse; // This class allows the Java-side embedder to substitute the default // URLRequest of a given request for an alternative job that will read data @@ -35,7 +35,7 @@ class AwRequestInterceptor : public net::URLRequestInterceptor { net::NetworkDelegate* network_delegate) const OVERRIDE; private: - scoped_ptr<InterceptedRequestData> QueryForInterceptedRequestData( + scoped_ptr<AwWebResourceResponse> QueryForAwWebResourceResponse( const GURL& location, net::URLRequest* request) const; diff --git a/android_webview/browser/intercepted_request_data.cc b/android_webview/browser/aw_web_resource_response.cc index 6e25ce1447..412d9c2a04 100644 --- a/android_webview/browser/intercepted_request_data.cc +++ b/android_webview/browser/aw_web_resource_response.cc @@ -1,11 +1,13 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "android_webview/browser/intercepted_request_data.h" +#include "android_webview/browser/aw_web_resource_response.h" #include "android_webview/browser/input_stream.h" #include "android_webview/browser/net/android_stream_reader_url_request_job.h" +#include "base/strings/string_number_conversions.h" +#include "net/http/http_response_headers.h" namespace android_webview { @@ -15,14 +17,14 @@ class StreamReaderJobDelegateImpl : public AndroidStreamReaderURLRequestJob::Delegate { public: StreamReaderJobDelegateImpl( - scoped_ptr<InterceptedRequestData> intercepted_request_data) - : intercepted_request_data_(intercepted_request_data.Pass()) { - DCHECK(intercepted_request_data_); + scoped_ptr<AwWebResourceResponse> aw_web_resource_response) + : aw_web_resource_response_(aw_web_resource_response.Pass()) { + DCHECK(aw_web_resource_response_); } virtual scoped_ptr<InputStream> OpenInputStream(JNIEnv* env, const GURL& url) OVERRIDE { - return intercepted_request_data_->GetInputStream(env).Pass(); + return aw_web_resource_response_->GetInputStream(env).Pass(); } virtual void OnInputStreamOpenFailed(net::URLRequest* request, @@ -34,28 +36,44 @@ class StreamReaderJobDelegateImpl net::URLRequest* request, android_webview::InputStream* stream, std::string* mime_type) OVERRIDE { - return intercepted_request_data_->GetMimeType(env, mime_type); + return aw_web_resource_response_->GetMimeType(env, mime_type); } virtual bool GetCharset(JNIEnv* env, net::URLRequest* request, android_webview::InputStream* stream, std::string* charset) OVERRIDE { - return intercepted_request_data_->GetCharset(env, charset); + return aw_web_resource_response_->GetCharset(env, charset); + } + + virtual void AppendResponseHeaders( + JNIEnv* env, + net::HttpResponseHeaders* headers) OVERRIDE { + int status_code; + std::string reason_phrase; + if (aw_web_resource_response_->GetStatusInfo( + env, &status_code, &reason_phrase)) { + std::string status_line("HTTP/1.1 "); + status_line.append(base::IntToString(status_code)); + status_line.append(" "); + status_line.append(reason_phrase); + headers->ReplaceStatusLine(status_line); + } + aw_web_resource_response_->GetResponseHeaders(env, headers); } private: - scoped_ptr<InterceptedRequestData> intercepted_request_data_; + scoped_ptr<AwWebResourceResponse> aw_web_resource_response_; }; } // namespace // static -net::URLRequestJob* InterceptedRequestData::CreateJobFor( - scoped_ptr<InterceptedRequestData> intercepted_request_data, +net::URLRequestJob* AwWebResourceResponse::CreateJobFor( + scoped_ptr<AwWebResourceResponse> aw_web_resource_response, net::URLRequest* request, net::NetworkDelegate* network_delegate) { - DCHECK(intercepted_request_data); + DCHECK(aw_web_resource_response); DCHECK(request); DCHECK(network_delegate); @@ -63,7 +81,7 @@ net::URLRequestJob* InterceptedRequestData::CreateJobFor( request, network_delegate, make_scoped_ptr( - new StreamReaderJobDelegateImpl(intercepted_request_data.Pass())) + new StreamReaderJobDelegateImpl(aw_web_resource_response.Pass())) .PassAs<AndroidStreamReaderURLRequestJob::Delegate>()); } diff --git a/android_webview/browser/intercepted_request_data.h b/android_webview/browser/aw_web_resource_response.h index acf031d338..34963606ff 100644 --- a/android_webview/browser/intercepted_request_data.h +++ b/android_webview/browser/aw_web_resource_response.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -11,9 +11,10 @@ #include "base/memory/scoped_ptr.h" namespace net { +class HttpResponseHeaders; +class NetworkDelegate; class URLRequest; class URLRequestJob; -class NetworkDelegate; } namespace android_webview { @@ -22,28 +23,36 @@ class InputStream; // This class represents the Java-side data that is to be used to complete a // particular URLRequest. -class InterceptedRequestData { +class AwWebResourceResponse { public: - virtual ~InterceptedRequestData() {} + virtual ~AwWebResourceResponse() {} virtual scoped_ptr<InputStream> GetInputStream(JNIEnv* env) const = 0; virtual bool GetMimeType(JNIEnv* env, std::string* mime_type) const = 0; virtual bool GetCharset(JNIEnv* env, std::string* charset) const = 0; + virtual bool GetStatusInfo(JNIEnv* env, + int* status_code, + std::string* reason_phrase) const = 0; + // If true is returned then |headers| contain the headers, if false is + // returned |headers| were not updated. + virtual bool GetResponseHeaders( + JNIEnv* env, + net::HttpResponseHeaders* headers) const = 0; // This creates a URLRequestJob for the |request| wich will read data from - // the |intercepted_request_data| structure (instead of going to the network + // the |aw_web_resource_response| structure (instead of going to the network // or to the cache). - // The newly created job takes ownership of |intercepted_request_data|. + // The newly created job takes ownership of |aw_web_resource_response|. static net::URLRequestJob* CreateJobFor( - scoped_ptr<InterceptedRequestData> intercepted_request_data, + scoped_ptr<AwWebResourceResponse> aw_web_resource_response, net::URLRequest* request, net::NetworkDelegate* network_delegate); protected: - InterceptedRequestData() {} + AwWebResourceResponse() {} private: - DISALLOW_COPY_AND_ASSIGN(InterceptedRequestData); + DISALLOW_COPY_AND_ASSIGN(AwWebResourceResponse); }; } // namespace android_webview diff --git a/android_webview/browser/net/android_stream_reader_url_request_job.cc b/android_webview/browser/net/android_stream_reader_url_request_job.cc index d7b407ecc7..5af452eb80 100644 --- a/android_webview/browser/net/android_stream_reader_url_request_job.cc +++ b/android_webview/browser/net/android_stream_reader_url_request_job.cc @@ -324,6 +324,10 @@ void AndroidStreamReaderURLRequestJob::HeadersComplete( } } + JNIEnv* env = AttachCurrentThread(); + DCHECK(env); + delegate_->AppendResponseHeaders(env, headers); + // Indicate that the response had been obtained via shouldInterceptRequest. headers->AddHeader(kResponseHeaderViaShouldInterceptRequest); diff --git a/android_webview/browser/net/android_stream_reader_url_request_job.h b/android_webview/browser/net/android_stream_reader_url_request_job.h index c516b760f3..b7d6a621c8 100644 --- a/android_webview/browser/net/android_stream_reader_url_request_job.h +++ b/android_webview/browser/net/android_stream_reader_url_request_job.h @@ -26,6 +26,7 @@ class TaskRunner; } namespace net { +class HttpResponseHeaders; class HttpResponseInfo; class URLRequest; } @@ -66,6 +67,9 @@ class AndroidStreamReaderURLRequestJob : public net::URLRequestJob { android_webview::InputStream* stream, std::string* charset) = 0; + virtual void AppendResponseHeaders(JNIEnv* env, + net::HttpResponseHeaders* headers) = 0; + virtual ~Delegate() {} }; diff --git a/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc b/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc index f09b5c5343..e419dd1dfd 100644 --- a/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc +++ b/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc @@ -12,6 +12,7 @@ #include "base/strings/stringprintf.h" #include "net/base/request_priority.h" #include "net/http/http_byte_range.h" +#include "net/http/http_response_headers.h" #include "net/url_request/url_request_job_factory_impl.h" #include "net/url_request/url_request_test_util.h" @@ -93,6 +94,12 @@ class StreamReaderDelegate : std::string* charset) OVERRIDE { return false; } + + virtual void AppendResponseHeaders( + JNIEnv* env, + net::HttpResponseHeaders* headers) OVERRIDE { + // no-op + } }; class NullStreamReaderDelegate : public StreamReaderDelegate { @@ -106,6 +113,34 @@ class NullStreamReaderDelegate : public StreamReaderDelegate { } }; +class HeaderAlteringStreamReaderDelegate : public NullStreamReaderDelegate { + public: + HeaderAlteringStreamReaderDelegate() {} + + virtual void AppendResponseHeaders( + JNIEnv* env, + net::HttpResponseHeaders* headers) OVERRIDE { + headers->ReplaceStatusLine(kStatusLine); + std::string headerLine(kCustomHeaderName); + headerLine.append(": "); + headerLine.append(kCustomHeaderValue); + headers->AddHeader(headerLine); + } + + static const int kResponseCode; + static const char* kStatusLine; + static const char* kCustomHeaderName; + static const char* kCustomHeaderValue; +}; + +const int HeaderAlteringStreamReaderDelegate::kResponseCode = 401; +const char* HeaderAlteringStreamReaderDelegate::kStatusLine = + "HTTP/1.1 401 Gone"; +const char* HeaderAlteringStreamReaderDelegate::kCustomHeaderName = + "X-Test-Header"; +const char* HeaderAlteringStreamReaderDelegate::kCustomHeaderValue = + "TestHeaderValue"; + class MockInputStreamReader : public InputStreamReader { public: MockInputStreamReader() : InputStreamReader(new NotImplInputStream()) {} @@ -245,6 +280,35 @@ TEST_F(AndroidStreamReaderURLRequestJobTest, ReadWithNullStream) { EXPECT_EQ(404, req_->GetResponseCode()); } +TEST_F(AndroidStreamReaderURLRequestJobTest, ModifyHeadersAndStatus) { + SetUpTestJob(scoped_ptr<InputStreamReader>(), + make_scoped_ptr(new HeaderAlteringStreamReaderDelegate()) + .PassAs<AndroidStreamReaderURLRequestJob::Delegate>()); + req_->Start(); + + // The TestDelegate will quit the message loop on request completion. + base::MessageLoop::current()->Run(); + + // The request_failed() method is named confusingly but all it checks is + // whether the request got as far as calling NotifyHeadersComplete. + EXPECT_FALSE(url_request_delegate_.request_failed()); + EXPECT_EQ(1, network_delegate_.completed_requests()); + // A null input stream shouldn't result in an error. See crbug.com/180950. + EXPECT_EQ(0, network_delegate_.error_count()); + EXPECT_EQ(HeaderAlteringStreamReaderDelegate::kResponseCode, + req_->GetResponseCode()); + EXPECT_EQ(HeaderAlteringStreamReaderDelegate::kStatusLine, + req_->response_headers()->GetStatusLine()); + EXPECT_TRUE(req_->response_headers()->HasHeader( + HeaderAlteringStreamReaderDelegate::kCustomHeaderName)); + std::string header_value; + EXPECT_TRUE(req_->response_headers()->EnumerateHeader( + NULL, HeaderAlteringStreamReaderDelegate::kCustomHeaderName, + &header_value)); + EXPECT_EQ(HeaderAlteringStreamReaderDelegate::kCustomHeaderValue, + header_value); +} + TEST_F(AndroidStreamReaderURLRequestJobTest, ReadPartOfStream) { const int bytes_available = 128; const int offset = 32; diff --git a/android_webview/build/AndroidManifest.xml b/android_webview/build/AndroidManifest.xml new file mode 100644 index 0000000000..5e8c3dba6a --- /dev/null +++ b/android_webview/build/AndroidManifest.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.webview.chromium"> +</manifest> diff --git a/android_webview/build/jarjar_resources.gypi b/android_webview/build/jarjar_resources.gypi new file mode 100644 index 0000000000..17838c6a76 --- /dev/null +++ b/android_webview/build/jarjar_resources.gypi @@ -0,0 +1,50 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +# +# This file is meant to be included into a target to provide a rule +# to run the equivalent of jarjar on Java resources (layout.xml files). +# +# To use this, create a gyp target with the following form: +# { +# 'target_name': 'my-package_java', +# 'type': 'none', +# 'variables': { +# 'java_in_dir': 'path/to/package/root', +# }, +# 'includes': ['path/to/this/gypi/file'], +# } +# +# Required variables: +# res_dir - The top-level resources folder. +# rules_file - Path to the file containing jar-jar rules. + +{ + 'variables': { + 'intermediate_dir': '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)', + 'jarjar_stamp': '<(intermediate_dir)/jarjar_resources.stamp', + 'resource_input_paths': ['<!@(find <(res_dir) -type f)'], + }, + 'actions': [{ + 'action_name': 'jarjar resources', + 'message': 'Copying and jar-jaring resources for <(_target_name)', + 'variables': { + 'out_dir': '<(intermediate_dir)/jarjar_res', + }, + 'inputs': [ + '<(DEPTH)/build/android/gyp/util/build_utils.py', + '<(DEPTH)/build/android/gyp/jarjar_resources.py', + '>@(resource_input_paths)', + ], + 'outputs': [ + '<(jarjar_stamp)', + ], + 'action': [ + 'python', '../build/android/gyp/jarjar_resources.py', + '--input-dir', '<(res_dir)', + '--output-dir', '<(out_dir)', + '--rules-path', '<(rules_file)', + '--stamp', '<(jarjar_stamp)', + ] + }], +} diff --git a/android_webview/build/resources_config.mk b/android_webview/build/resources_config.mk new file mode 100644 index 0000000000..f9ab135262 --- /dev/null +++ b/android_webview/build/resources_config.mk @@ -0,0 +1,17 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +android_webview_manifest_file := $(call my-dir)/AndroidManifest.xml + +# resources +android_webview_resources_dirs := \ + $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/android_webview_jarjar_content_resources/jarjar_res \ + $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/android_webview_jarjar_ui_resources/jarjar_res \ + $(call intermediates-dir-for,GYP,ui_strings_grd,,,$(TARGET_2ND_ARCH))/ui_strings_grd/res_grit \ + $(call intermediates-dir-for,GYP,content_strings_grd,,,$(TARGET_2ND_ARCH))/content_strings_grd/res_grit + +android_webview_aapt_flags := --auto-add-overlay +android_webview_aapt_flags += --custom-package com.android.webview.chromium +android_webview_aapt_flags += --extra-packages org.chromium.ui +android_webview_aapt_flags += --extra-packages org.chromium.content diff --git a/android_webview/buildbot/aosp_manifest.xml b/android_webview/buildbot/aosp_manifest.xml index f83ae3552e..aaae29c7b1 100644 --- a/android_webview/buildbot/aosp_manifest.xml +++ b/android_webview/buildbot/aosp_manifest.xml @@ -261,7 +261,7 @@ <project name="platform/frameworks/support" path="frameworks/support" revision="1e3d0c89282627f8b0d66d2bdae4efc2287ab043"/> <project name="platform/frameworks/testing" path="frameworks/testing" revision="5c8e0271db889518f5969b142a37faa01a4ee54d"/> <project name="platform/frameworks/volley" path="frameworks/volley" revision="a53cb80bea6fc83edfa73e7a850e83f4020fcf07"/> - <project name="platform/frameworks/webview" path="frameworks/webview" revision="69047640da7b4efa4b0de2cb2b9559fde5f31a21"/> + <project name="platform/frameworks/webview" path="frameworks/webview" revision="2b4719f12bac2f9f71d99567f09f46916903edf8"/> <project name="platform/frameworks/wilhelm" path="frameworks/wilhelm" revision="a62c3572e60ae0446632de15418a65089cccf551"/> <project name="platform/hardware/akm" path="hardware/akm" revision="32838ef838d1341aa8b77022869b801fb0bbb26c"/> <project groups="pdk" name="platform/hardware/broadcom/libbt" path="hardware/broadcom/libbt" revision="55ddd0cce019e88829f92b2fe4e17d5869daa9b9"/> diff --git a/android_webview/java/DEPS b/android_webview/java/DEPS index a6c4c30e89..d04003daa7 100644 --- a/android_webview/java/DEPS +++ b/android_webview/java/DEPS @@ -2,4 +2,5 @@ include_rules = [ "+content/public/android/java", "+components/navigation_interception/android/java", "+components/web_contents_delegate_android/android/java", + "+media/base/android/java", ] diff --git a/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java b/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java index 7044cb77fc..15c5edbb9a 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java +++ b/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java @@ -5,13 +5,16 @@ package org.chromium.android_webview; import android.content.Context; +import android.util.Log; import org.chromium.base.PathUtils; import org.chromium.base.ThreadUtils; import org.chromium.base.library_loader.LibraryLoader; import org.chromium.base.library_loader.ProcessInitException; import org.chromium.content.browser.BrowserStartupController; +import org.chromium.media.MediaDrmBridge; +import java.util.UUID; /** * Wrapper for the steps needed to initialize the java and native sides of webview chromium. @@ -50,10 +53,25 @@ public abstract class AwBrowserProcess { try { BrowserStartupController.get(context).startBrowserProcessesSync( BrowserStartupController.MAX_RENDERERS_SINGLE_PROCESS); + initializePlatformKeySystem(); } catch (ProcessInitException e) { throw new RuntimeException("Cannot initialize WebView", e); } } }); } + + private static void initializePlatformKeySystem() { + String[] mappings = AwResource.getConfigKeySystemUuidMapping(); + for (String mapping : mappings) { + try { + String fragments[] = mapping.split(","); + String keySystem = fragments[0].trim(); + UUID uuid = UUID.fromString(fragments[1]); + MediaDrmBridge.addKeySystemUuidMapping(keySystem, uuid); + } catch (java.lang.RuntimeException e) { + Log.e(TAG, "Can't parse key-system mapping: " + mapping); + } + } + } } diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java index 98a1d1c79b..340e18cc61 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java @@ -252,7 +252,7 @@ public class AwContents { private CleanupReference mCleanupReference; //-------------------------------------------------------------------------------------------- - private class IoThreadClientImpl implements AwContentsIoThreadClient { + private class IoThreadClientImpl extends AwContentsIoThreadClient { // All methods are called on the IO thread. @Override @@ -261,21 +261,22 @@ public class AwContents { } @Override - public InterceptedRequestData shouldInterceptRequest(final String url, - boolean isMainFrame) { - InterceptedRequestData interceptedRequestData; + public AwWebResourceResponse shouldInterceptRequest( + AwContentsClient.ShouldInterceptRequestParams params) { + String url = params.url; + AwWebResourceResponse awWebResourceResponse; // Return the response directly if the url is default video poster url. - interceptedRequestData = mDefaultVideoPosterRequestHandler.shouldInterceptRequest(url); - if (interceptedRequestData != null) return interceptedRequestData; + awWebResourceResponse = mDefaultVideoPosterRequestHandler.shouldInterceptRequest(url); + if (awWebResourceResponse != null) return awWebResourceResponse; - interceptedRequestData = mContentsClient.shouldInterceptRequest(url); + awWebResourceResponse = mContentsClient.shouldInterceptRequest(params); - if (interceptedRequestData == null) { + if (awWebResourceResponse == null) { mContentsClient.getCallbackHelper().postOnLoadResource(url); } - if (isMainFrame && interceptedRequestData != null && - interceptedRequestData.getData() == null) { + if (params.isMainFrame && awWebResourceResponse != null && + awWebResourceResponse.getData() == null) { // In this case the intercepted URLRequest job will simulate an empty response // which doesn't trigger the onReceivedError callback. For WebViewClassic // compatibility we synthesize that callback. http://crbug.com/180950 @@ -283,7 +284,7 @@ public class AwContents { ErrorCodeConversionHelper.ERROR_UNKNOWN, null /* filled in by the glue layer */, url); } - return interceptedRequestData; + return awWebResourceResponse; } @Override diff --git a/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java b/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java index 4b952831af..5c41d62cfd 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java +++ b/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java @@ -10,6 +10,7 @@ import android.graphics.Picture; import android.net.http.SslError; import android.os.Looper; import android.os.Message; +import android.util.ArrayMap; import android.view.KeyEvent; import android.view.View; import android.webkit.ConsoleMessage; @@ -148,13 +149,30 @@ public abstract class AwContentsClient { public boolean capture; } + /** + * Parameters for the {@link AwContentsClient#shouldInterceptRequest} method. + */ + public static class ShouldInterceptRequestParams { + // Url of the request. + public String url; + // Is this for the main frame or a child iframe? + public boolean isMainFrame; + // Was a gesture associated with the request? Don't trust can easily be spoofed. + public boolean hasUserGesture; + // Method used (GET/POST/OPTIONS) + public String method; + // Headers that would have been sent to server. + public ArrayMap<String, String> requestHeaders; + } + public abstract void getVisitedHistory(ValueCallback<String[]> callback); public abstract void doUpdateVisitedHistory(String url, boolean isReload); public abstract void onProgressChanged(int progress); - public abstract InterceptedRequestData shouldInterceptRequest(String url); + public abstract AwWebResourceResponse shouldInterceptRequest( + ShouldInterceptRequestParams params); public abstract boolean shouldOverrideKeyEvent(KeyEvent event); diff --git a/android_webview/java/src/org/chromium/android_webview/AwContentsIoThreadClient.java b/android_webview/java/src/org/chromium/android_webview/AwContentsIoThreadClient.java index fe59d2bbf8..087e01714c 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwContentsIoThreadClient.java +++ b/android_webview/java/src/org/chromium/android_webview/AwContentsIoThreadClient.java @@ -4,6 +4,9 @@ package org.chromium.android_webview; +import android.util.ArrayMap; + +import org.chromium.android_webview.AwContentsClient; import org.chromium.base.CalledByNative; import org.chromium.base.JNINamespace; @@ -14,29 +17,48 @@ import org.chromium.base.JNINamespace; * provided functionality. */ @JNINamespace("android_webview") -public interface AwContentsIoThreadClient { +public abstract class AwContentsIoThreadClient { @CalledByNative - public int getCacheMode(); + public abstract int getCacheMode(); @CalledByNative - public InterceptedRequestData shouldInterceptRequest(String url, boolean isMainFrame); + public abstract boolean shouldBlockContentUrls(); @CalledByNative - public boolean shouldBlockContentUrls(); + public abstract boolean shouldBlockFileUrls(); @CalledByNative - public boolean shouldBlockFileUrls(); + public abstract boolean shouldBlockNetworkLoads(); @CalledByNative - public boolean shouldBlockNetworkLoads(); + public abstract boolean shouldAcceptThirdPartyCookies(); @CalledByNative - public boolean shouldAcceptThirdPartyCookies(); + public abstract void onDownloadStart(String url, String userAgent, + String contentDisposition, String mimeType, long contentLength); @CalledByNative - public void onDownloadStart(String url, String userAgent, - String contentDisposition, String mimeType, long contentLength); + public abstract void newLoginRequest(String realm, String account, String args); + + public abstract AwWebResourceResponse shouldInterceptRequest( + AwContentsClient.ShouldInterceptRequestParams params); + + // Protected methods --------------------------------------------------------------------------- @CalledByNative - public void newLoginRequest(String realm, String account, String args); + protected AwWebResourceResponse shouldInterceptRequest(String url, boolean isMainFrame, + boolean hasUserGesture, String method, String[] requestHeaderNames, + String[] requestHeaderValues) { + AwContentsClient.ShouldInterceptRequestParams params = + new AwContentsClient.ShouldInterceptRequestParams(); + params.url = url; + params.isMainFrame = isMainFrame; + params.hasUserGesture = hasUserGesture; + params.method = method; + params.requestHeaders = new ArrayMap<String, String>(requestHeaderNames.length); + for (int i = 0; i < requestHeaderNames.length; ++i) { + params.requestHeaders.put(requestHeaderNames[i], requestHeaderValues[i]); + } + return shouldInterceptRequest(params); + } } diff --git a/android_webview/java/src/org/chromium/android_webview/AwResource.java b/android_webview/java/src/org/chromium/android_webview/AwResource.java index ee658e4f24..3b3b3265f4 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwResource.java +++ b/android_webview/java/src/org/chromium/android_webview/AwResource.java @@ -35,6 +35,9 @@ public class AwResource { // String resource ID for the default text encoding to use. private static int STRING_DEFAULT_TEXT_ENCODING; + // Array resource ID for the configuration of platform specific key-systems. + private static int STRING_ARRAY_CONFIG_KEY_SYSTEM_UUID_MAPPING; + // The embedder should inject a Resources object that will be used // to resolve Resource IDs into the actual resources. private static Resources sResources; @@ -59,6 +62,10 @@ public class AwResource { STRING_DEFAULT_TEXT_ENCODING = encoding; } + public static void setConfigKeySystemUuidMapping(int config) { + STRING_ARRAY_CONFIG_KEY_SYSTEM_UUID_MAPPING = config; + } + @CalledByNative public static String getDefaultTextEncoding() { return getResource(STRING_DEFAULT_TEXT_ENCODING, TYPE_STRING); @@ -74,6 +81,11 @@ public class AwResource { return getResource(RAW_LOAD_ERROR, TYPE_RAW); } + public static String[] getConfigKeySystemUuidMapping() { + // No need to cache, since this should be called only once. + return sResources.getStringArray(STRING_ARRAY_CONFIG_KEY_SYSTEM_UUID_MAPPING); + } + private static String getResource(int resid, int type) { assert resid != 0; assert sResources != null; diff --git a/android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java b/android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java new file mode 100644 index 0000000000..1b861c01b4 --- /dev/null +++ b/android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java @@ -0,0 +1,83 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.android_webview; + +import org.chromium.base.CalledByNative; +import org.chromium.base.JNINamespace; + +import java.io.InputStream; +import java.util.Map; + +/** + * The response information that is to be returned for a particular resource fetch. + */ +@JNINamespace("android_webview") +public class AwWebResourceResponse { + private String mMimeType; + private String mCharset; + private InputStream mData; + private int mStatusCode; + private String mReasonPhrase; + private String[] mResponseHeaderNames; + private String[] mResponseHeaderValues; + + public AwWebResourceResponse(String mimeType, String encoding, InputStream data) { + mMimeType = mimeType; + mCharset = encoding; + mData = data; + } + + public AwWebResourceResponse(String mimeType, String encoding, InputStream data, + int statusCode, String reasonPhrase, Map<String, String> responseHeaders) { + this(mimeType, encoding, data); + + mStatusCode = statusCode; + mReasonPhrase = reasonPhrase; + + mResponseHeaderNames = new String[responseHeaders.size()]; + mResponseHeaderValues = new String[responseHeaders.size()]; + int i = 0; + for (Map.Entry<String, String> entry : responseHeaders.entrySet()) { + mResponseHeaderNames[i] = entry.getKey(); + mResponseHeaderValues[i] = entry.getValue(); + i++; + } + } + + @CalledByNative + public String getMimeType() { + return mMimeType; + } + + @CalledByNative + public String getCharset() { + return mCharset; + } + + @CalledByNative + public InputStream getData() { + return mData; + } + + @CalledByNative + public int getStatusCode() { + return mStatusCode; + } + + @CalledByNative + public String getReasonPhrase() { + return mReasonPhrase; + } + + @CalledByNative + public String[] getResponseHeaderNames() { + return mResponseHeaderNames; + } + + @CalledByNative + public String[] getResponseHeaderValues() { + return mResponseHeaderValues; + } +} diff --git a/android_webview/java/src/org/chromium/android_webview/DefaultVideoPosterRequestHandler.java b/android_webview/java/src/org/chromium/android_webview/DefaultVideoPosterRequestHandler.java index df2290abb4..aaed9f8ec4 100644 --- a/android_webview/java/src/org/chromium/android_webview/DefaultVideoPosterRequestHandler.java +++ b/android_webview/java/src/org/chromium/android_webview/DefaultVideoPosterRequestHandler.java @@ -81,14 +81,14 @@ public class DefaultVideoPosterRequestHandler { * Used to get the image if the url is mDefaultVideoPosterURL. * * @param url the url requested - * @return InterceptedRequestData which caller can get the image if the url is + * @return AwWebResourceResponse which caller can get the image if the url is * the default video poster URL, otherwise null is returned. */ - public InterceptedRequestData shouldInterceptRequest(final String url) { + public AwWebResourceResponse shouldInterceptRequest(final String url) { if (!mDefaultVideoPosterURL.equals(url)) return null; try { - return new InterceptedRequestData("image/png", null, getInputStream(mContentClient)); + return new AwWebResourceResponse("image/png", null, getInputStream(mContentClient)); } catch (IOException e) { Log.e(TAG, null, e); return null; diff --git a/android_webview/java/src/org/chromium/android_webview/InterceptedRequestData.java b/android_webview/java/src/org/chromium/android_webview/InterceptedRequestData.java deleted file mode 100644 index 78f9382015..0000000000 --- a/android_webview/java/src/org/chromium/android_webview/InterceptedRequestData.java +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -package org.chromium.android_webview; - -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; - -import java.io.InputStream; - -/** - * The response information that is to be returned for a particular resource fetch. - */ -@JNINamespace("android_webview") -public class InterceptedRequestData { - private String mMimeType; - private String mCharset; - private InputStream mData; - - public InterceptedRequestData(String mimeType, String encoding, InputStream data) { - mMimeType = mimeType; - mCharset = encoding; - mData = data; - } - - @CalledByNative - public String getMimeType() { - return mMimeType; - } - - @CalledByNative - public String getCharset() { - return mCharset; - } - - @CalledByNative - public InputStream getData() { - return mData; - } -} diff --git a/android_webview/java_library_common.mk b/android_webview/java_library_common.mk new file mode 100644 index 0000000000..e06b40e651 --- /dev/null +++ b/android_webview/java_library_common.mk @@ -0,0 +1,65 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +LOCAL_SRC_FILES := $(call all-java-files-under, java/src) + +# contentview and its dependencies +LOCAL_AIDL_INCLUDES := \ + $(LOCAL_PATH)/../content/public/android/java/src \ + $(LOCAL_PATH)/../net/android/java/src \ + $(LOCAL_PATH)/../third_party/eyesfree/src/android/java/src + +LOCAL_SRC_FILES += \ + $(call all-java-files-under, ../content/public/android/java/src) \ + ../content/public/android/java/src/org/chromium/content/common/IChildProcessCallback.aidl \ + ../content/public/android/java/src/org/chromium/content/common/IChildProcessService.aidl \ + ../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStoreCallbacks.aidl \ + ../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStore.aidl \ + $(call all-java-files-under, ../base/android/java/src) \ + $(call all-java-files-under, ../media/base/android/java/src) \ + $(call all-java-files-under, ../net/android/java/src) \ + $(call all-java-files-under, ../ui/android/java/src) \ + $(call all-java-files-under, ../third_party/eyesfree/src/android/java/src) \ + $(call all-Iaidl-files-under, ../third_party/eyesfree/src/android/java/src) + +# browser components +LOCAL_SRC_FILES += \ + $(call all-java-files-under, \ + ../components/web_contents_delegate_android/android/java/src) \ + $(call all-java-files-under, \ + ../components/navigation_interception/android/java/src) \ + +# This directory includes .java files that are generated by the normal gyp build, but are checked in +# for the Android build. +# TODO(torne, cjhopman): Consider removing this. +LOCAL_SRC_FILES += \ + $(call all-java-files-under, java/generated_src) + +# Java files generated from .template rules. This list should match list of java dependencies in +# android_webview/all_webview.gyp +# TODO(torne): remove TARGET_2ND_ARCH here once we're no longer 64-bit blacklisted in the Android +# build system. http://crbug.com/358141 +LOCAL_GENERATED_SOURCES := \ +$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/base/ApplicationState.java \ +$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/base/MemoryPressureLevelList.java \ +$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/GestureEventType.java \ +$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/PageTransitionTypes.java \ +$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/SpeechRecognitionError.java \ +$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/input/CanonicalAxisIndex.java \ +$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/input/CanonicalButtonIndex.java \ +$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/input/PopupItemType.java \ +$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/common/ResultCodes.java \ +$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/common/ScreenOrientationValues.java \ +$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/media/ImageFormat.java \ +$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/net/CertificateMimeType.java \ +$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/net/CertVerifyStatusAndroid.java \ +$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/net/NetError.java \ +$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/net/PrivateKeyType.java \ +$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/ui/WindowOpenDisposition.java \ +$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/ui/gfx/BitmapFormat.java \ + +# content dependencies on java components that are provided by the system on +# android +LOCAL_STATIC_JAVA_LIBRARIES += jsr305 guava + diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetDefaultVideoPosterTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetDefaultVideoPosterTest.java index 8891fb9822..fea72ffa93 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetDefaultVideoPosterTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetDefaultVideoPosterTest.java @@ -10,8 +10,8 @@ import android.graphics.BitmapFactory; import android.test.suitebuilder.annotation.SmallTest; import android.util.Log; +import org.chromium.android_webview.AwWebResourceResponse; import org.chromium.android_webview.DefaultVideoPosterRequestHandler; -import org.chromium.android_webview.InterceptedRequestData; import org.chromium.base.test.util.Feature; import org.chromium.content.browser.test.util.CallbackHelper; @@ -77,7 +77,7 @@ public class AwContentsClientGetDefaultVideoPosterTest extends AwTestBase { new DefaultVideoPosterClient(getInstrumentation().getTargetContext()); DefaultVideoPosterRequestHandler handler = new DefaultVideoPosterRequestHandler(contentsClient); - InterceptedRequestData requestData = + AwWebResourceResponse requestData = handler.shouldInterceptRequest(handler.getDefaultVideoPosterURL()); assertTrue(requestData.getMimeType().equals("image/png")); Bitmap bitmap = BitmapFactory.decodeStream(requestData.getData()); @@ -94,7 +94,7 @@ public class AwContentsClientGetDefaultVideoPosterTest extends AwTestBase { NullContentsClient contentsClient = new NullContentsClient(); DefaultVideoPosterRequestHandler handler = new DefaultVideoPosterRequestHandler(contentsClient); - InterceptedRequestData requestData = + AwWebResourceResponse requestData = handler.shouldInterceptRequest(handler.getDefaultVideoPosterURL()); assertTrue(requestData.getMimeType().equals("image/png")); InputStream in = requestData.getData(); diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java index fff12d2898..e1bcb59fbf 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java @@ -8,8 +8,10 @@ import android.test.suitebuilder.annotation.SmallTest; import android.util.Pair; import org.chromium.android_webview.AwContents; -import org.chromium.android_webview.InterceptedRequestData; +import org.chromium.android_webview.AwContentsClient.ShouldInterceptRequestParams; +import org.chromium.android_webview.AwWebResourceResponse; import org.chromium.android_webview.test.util.CommonResources; +import org.chromium.android_webview.test.util.JSUtils; import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.TestFileUtil; import org.chromium.content.browser.test.util.CallbackHelper; @@ -20,7 +22,9 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; @@ -35,27 +39,35 @@ public class AwContentsClientShouldInterceptRequestTest extends AwTestBase { public static class ShouldInterceptRequestHelper extends CallbackHelper { private List<String> mShouldInterceptRequestUrls = new ArrayList<String>(); - private ConcurrentHashMap<String, InterceptedRequestData> mReturnValuesByUrls - = new ConcurrentHashMap<String, InterceptedRequestData>(); + private ConcurrentHashMap<String, AwWebResourceResponse> mReturnValuesByUrls + = new ConcurrentHashMap<String, AwWebResourceResponse>(); + private ConcurrentHashMap<String, ShouldInterceptRequestParams> mParamsByUrls + = new ConcurrentHashMap<String, ShouldInterceptRequestParams>(); // This is read from the IO thread, so needs to be marked volatile. - private volatile InterceptedRequestData mShouldInterceptRequestReturnValue = null; - void setReturnValue(InterceptedRequestData value) { + private volatile AwWebResourceResponse mShouldInterceptRequestReturnValue = null; + void setReturnValue(AwWebResourceResponse value) { mShouldInterceptRequestReturnValue = value; } - void setReturnValueForUrl(String url, InterceptedRequestData value) { + void setReturnValueForUrl(String url, AwWebResourceResponse value) { mReturnValuesByUrls.put(url, value); } public List<String> getUrls() { assert getCallCount() > 0; return mShouldInterceptRequestUrls; } - public InterceptedRequestData getReturnValue(String url) { - InterceptedRequestData value = mReturnValuesByUrls.get(url); + public AwWebResourceResponse getReturnValue(String url) { + AwWebResourceResponse value = mReturnValuesByUrls.get(url); if (value != null) return value; return mShouldInterceptRequestReturnValue; } - public void notifyCalled(String url) { - mShouldInterceptRequestUrls.add(url); + public ShouldInterceptRequestParams getParamsForUrl(String url) { + assert getCallCount() > 0; + assert mParamsByUrls.containsKey(url); + return mParamsByUrls.get(url); + } + public void notifyCalled(ShouldInterceptRequestParams params) { + mShouldInterceptRequestUrls.add(params.url); + mParamsByUrls.put(params.url, params); notifyCalled(); } } @@ -75,9 +87,10 @@ public class AwContentsClientShouldInterceptRequestTest extends AwTestBase { } @Override - public InterceptedRequestData shouldInterceptRequest(String url) { - InterceptedRequestData returnValue = mShouldInterceptRequestHelper.getReturnValue(url); - mShouldInterceptRequestHelper.notifyCalled(url); + public AwWebResourceResponse shouldInterceptRequest(ShouldInterceptRequestParams params) { + AwWebResourceResponse returnValue = + mShouldInterceptRequestHelper.getReturnValue(params.url); + mShouldInterceptRequestHelper.notifyCalled(params); return returnValue; } @@ -104,6 +117,9 @@ public class AwContentsClientShouldInterceptRequestTest extends AwTestBase { } } + final int teapotStatusCode = 418; + final String teapotResponsePhrase = "I'm a teapot"; + private String addPageToTestServer(TestWebServer webServer, String httpPath, String html) { List<Pair<String, String>> headers = new ArrayList<Pair<String, String>>(); headers.add(Pair.create("Content-Type", "text/html")); @@ -116,11 +132,11 @@ public class AwContentsClientShouldInterceptRequestTest extends AwTestBase { CommonResources.ABOUT_HTML); } - private InterceptedRequestData stringToInterceptedRequestData(String input) throws Throwable { + private AwWebResourceResponse stringToAwWebResourceResponse(String input) throws Throwable { final String mimeType = "text/html"; final String encoding = "UTF-8"; - return new InterceptedRequestData( + return new AwWebResourceResponse( mimeType, encoding, new ByteArrayInputStream(input.getBytes(encoding))); } @@ -150,14 +166,13 @@ public class AwContentsClientShouldInterceptRequestTest extends AwTestBase { @SmallTest @Feature({"AndroidWebView"}) - public void testCalledWithCorrectUrl() throws Throwable { + public void testCalledWithCorrectUrlParam() throws Throwable { final String aboutPageUrl = addAboutPageToTestServer(mWebServer); - int callCount = mShouldInterceptRequestHelper.getCallCount(); int onPageFinishedCallCount = mContentsClient.getOnPageFinishedHelper().getCallCount(); + int callCount = mShouldInterceptRequestHelper.getCallCount(); loadUrlAsync(mAwContents, aboutPageUrl); - mShouldInterceptRequestHelper.waitForCallback(callCount); assertEquals(1, mShouldInterceptRequestHelper.getUrls().size()); assertEquals(aboutPageUrl, @@ -169,6 +184,95 @@ public class AwContentsClientShouldInterceptRequestTest extends AwTestBase { @SmallTest @Feature({"AndroidWebView"}) + public void testCalledWithCorrectIsMainFrameParam() throws Throwable { + final String subframeUrl = addAboutPageToTestServer(mWebServer); + final String pageWithIframeUrl = addPageToTestServer(mWebServer, "/page_with_iframe.html", + CommonResources.makeHtmlPageFrom("", + "<iframe src=\"" + subframeUrl + "\"/>")); + + int callCount = mShouldInterceptRequestHelper.getCallCount(); + loadUrlAsync(mAwContents, pageWithIframeUrl); + mShouldInterceptRequestHelper.waitForCallback(callCount, 2); + assertEquals(2, mShouldInterceptRequestHelper.getUrls().size()); + assertEquals(false, + mShouldInterceptRequestHelper.getParamsForUrl(subframeUrl).isMainFrame); + assertEquals(true, + mShouldInterceptRequestHelper.getParamsForUrl(pageWithIframeUrl).isMainFrame); + } + + @SmallTest + @Feature({"AndroidWebView"}) + public void testCalledWithCorrectMethodParam() throws Throwable { + final String pageToPostToUrl = addAboutPageToTestServer(mWebServer); + final String pageWithFormUrl = addPageToTestServer(mWebServer, "/page_with_form.html", + CommonResources.makeHtmlPageWithSimplePostFormTo(pageToPostToUrl)); + enableJavaScriptOnUiThread(mAwContents); + + int callCount = mShouldInterceptRequestHelper.getCallCount(); + loadUrlAsync(mAwContents, pageWithFormUrl); + mShouldInterceptRequestHelper.waitForCallback(callCount); + assertEquals("GET", + mShouldInterceptRequestHelper.getParamsForUrl(pageWithFormUrl).method); + + callCount = mShouldInterceptRequestHelper.getCallCount(); + JSUtils.clickOnLinkUsingJs(this, mAwContents, + mContentsClient.getOnEvaluateJavaScriptResultHelper(), "link"); + mShouldInterceptRequestHelper.waitForCallback(callCount); + assertEquals("POST", + mShouldInterceptRequestHelper.getParamsForUrl(pageToPostToUrl).method); + } + + @SmallTest + @Feature({"AndroidWebView"}) + public void testCalledWithCorrectHasUserGestureParam() throws Throwable { + final String aboutPageUrl = addAboutPageToTestServer(mWebServer); + final String pageWithLinkUrl = addPageToTestServer(mWebServer, "/page_with_link.html", + CommonResources.makeHtmlPageWithSimpleLinkTo(aboutPageUrl)); + enableJavaScriptOnUiThread(mAwContents); + + int callCount = mShouldInterceptRequestHelper.getCallCount(); + loadUrlAsync(mAwContents, pageWithLinkUrl); + mShouldInterceptRequestHelper.waitForCallback(callCount); + assertEquals(false, + mShouldInterceptRequestHelper.getParamsForUrl(pageWithLinkUrl).hasUserGesture); + + callCount = mShouldInterceptRequestHelper.getCallCount(); + JSUtils.clickOnLinkUsingJs(this, mAwContents, + mContentsClient.getOnEvaluateJavaScriptResultHelper(), "link"); + mShouldInterceptRequestHelper.waitForCallback(callCount); + assertEquals(true, + mShouldInterceptRequestHelper.getParamsForUrl(aboutPageUrl).hasUserGesture); + } + + @SmallTest + @Feature({"AndroidWebView"}) + public void testCalledWithCorrectHeadersParam() throws Throwable { + final String headerName = "X-Test-Header-Name"; + final String headerValue = "TestHeaderValue"; + final String syncGetUrl = addPageToTestServer(mWebServer, "/intercept_me", + CommonResources.ABOUT_HTML); + final String mainPageUrl = addPageToTestServer(mWebServer, "/main", + CommonResources.makeHtmlPageFrom("", + "<script>" + + " var xhr = new XMLHttpRequest();" + + " xhr.open('GET', '" + syncGetUrl + "', false);" + + " xhr.setRequestHeader('" + headerName + "', '" + headerValue + "'); " + + " xhr.send(null);" + + "</script>")); + enableJavaScriptOnUiThread(mAwContents); + + int callCount = mShouldInterceptRequestHelper.getCallCount(); + loadUrlAsync(mAwContents, mainPageUrl); + mShouldInterceptRequestHelper.waitForCallback(callCount, 2); + + Map<String, String> headers = + mShouldInterceptRequestHelper.getParamsForUrl(syncGetUrl).requestHeaders; + assertTrue(headers.containsKey(headerName)); + assertEquals(headerValue, headers.get(headerName)); + } + + @SmallTest + @Feature({"AndroidWebView"}) public void testOnLoadResourceCalledWithCorrectUrl() throws Throwable { final String aboutPageUrl = addAboutPageToTestServer(mWebServer); final TestAwContentsClient.OnLoadResourceHelper onLoadResourceHelper = @@ -188,19 +292,19 @@ public class AwContentsClientShouldInterceptRequestTest extends AwTestBase { final String aboutPageUrl = addAboutPageToTestServer(mWebServer); mShouldInterceptRequestHelper.setReturnValue( - new InterceptedRequestData("text/html", "UTF-8", null)); + new AwWebResourceResponse("text/html", "UTF-8", null)); int callCount = mShouldInterceptRequestHelper.getCallCount(); loadUrlAsync(mAwContents, aboutPageUrl); mShouldInterceptRequestHelper.waitForCallback(callCount); mShouldInterceptRequestHelper.setReturnValue( - new InterceptedRequestData(null, null, new ByteArrayInputStream(new byte[0]))); + new AwWebResourceResponse(null, null, new ByteArrayInputStream(new byte[0]))); callCount = mShouldInterceptRequestHelper.getCallCount(); loadUrlAsync(mAwContents, aboutPageUrl); mShouldInterceptRequestHelper.waitForCallback(callCount); mShouldInterceptRequestHelper.setReturnValue( - new InterceptedRequestData(null, null, null)); + new AwWebResourceResponse(null, null, null)); callCount = mShouldInterceptRequestHelper.getCallCount(); loadUrlAsync(mAwContents, aboutPageUrl); mShouldInterceptRequestHelper.waitForCallback(callCount); @@ -241,7 +345,7 @@ public class AwContentsClientShouldInterceptRequestTest extends AwTestBase { final String aboutPageUrl = addAboutPageToTestServer(mWebServer); mShouldInterceptRequestHelper.setReturnValue( - new InterceptedRequestData("text/html", "UTF-8", new EmptyInputStream())); + new AwWebResourceResponse("text/html", "UTF-8", new EmptyInputStream())); int shouldInterceptRequestCallCount = mShouldInterceptRequestHelper.getCallCount(); int onPageFinishedCallCount = mContentsClient.getOnPageFinishedHelper().getCallCount(); @@ -251,11 +355,11 @@ public class AwContentsClientShouldInterceptRequestTest extends AwTestBase { mContentsClient.getOnPageFinishedHelper().waitForCallback(onPageFinishedCallCount); } - private static class SlowInterceptedRequestData extends InterceptedRequestData { + private static class SlowAwWebResourceResponse extends AwWebResourceResponse { private CallbackHelper mReadStartedCallbackHelper = new CallbackHelper(); private CountDownLatch mLatch = new CountDownLatch(1); - public SlowInterceptedRequestData(String mimeType, String encoding, InputStream data) { + public SlowAwWebResourceResponse(String mimeType, String encoding, InputStream data) { super(mimeType, encoding, data); } @@ -285,14 +389,14 @@ public class AwContentsClientShouldInterceptRequestTest extends AwTestBase { final String aboutPageUrl = addAboutPageToTestServer(mWebServer); final String aboutPageData = makePageWithTitle("some title"); final String encoding = "UTF-8"; - final SlowInterceptedRequestData slowInterceptedRequestData = - new SlowInterceptedRequestData("text/html", encoding, + final SlowAwWebResourceResponse slowAwWebResourceResponse = + new SlowAwWebResourceResponse("text/html", encoding, new ByteArrayInputStream(aboutPageData.getBytes(encoding))); - mShouldInterceptRequestHelper.setReturnValue(slowInterceptedRequestData); - int callCount = slowInterceptedRequestData.getReadStartedCallbackHelper().getCallCount(); + mShouldInterceptRequestHelper.setReturnValue(slowAwWebResourceResponse); + int callCount = slowAwWebResourceResponse.getReadStartedCallbackHelper().getCallCount(); loadUrlAsync(mAwContents, aboutPageUrl); - slowInterceptedRequestData.getReadStartedCallbackHelper().waitForCallback(callCount); + slowAwWebResourceResponse.getReadStartedCallbackHelper().waitForCallback(callCount); // Now the AwContents is "stuck" waiting for the SlowInputStream to finish reading so we // delete it to make sure that the dangling 'read' task doesn't cause a crash. Unfortunately @@ -312,12 +416,12 @@ public class AwContentsClientShouldInterceptRequestTest extends AwTestBase { } }); - slowInterceptedRequestData.unblockReads(); + slowAwWebResourceResponse.unblockReads(); } @SmallTest @Feature({"AndroidWebView"}) - public void testHttpStatusField() throws Throwable { + public void testHttpStatusCodeAndText() throws Throwable { final String syncGetUrl = mWebServer.getResponseUrl("/intercept_me"); final String syncGetJs = "(function() {" + @@ -325,7 +429,8 @@ public class AwContentsClientShouldInterceptRequestTest extends AwTestBase { " xhr.open('GET', '" + syncGetUrl + "', false);" + " xhr.send(null);" + " console.info('xhr.status = ' + xhr.status);" + - " return xhr.status;" + + " console.info('xhr.statusText = ' + xhr.statusText);" + + " return '[' + xhr.status + '][' + xhr.statusText + ']';" + "})();"; enableJavaScriptOnUiThread(mAwContents); @@ -333,32 +438,47 @@ public class AwContentsClientShouldInterceptRequestTest extends AwTestBase { loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), aboutPageUrl); mShouldInterceptRequestHelper.setReturnValue( - new InterceptedRequestData("text/html", "UTF-8", null)); - assertEquals("404", + new AwWebResourceResponse("text/html", "UTF-8", null)); + assertEquals("\"[404][Not Found]\"", executeJavaScriptAndWaitForResult(mAwContents, mContentsClient, syncGetJs)); mShouldInterceptRequestHelper.setReturnValue( - new InterceptedRequestData("text/html", "UTF-8", new EmptyInputStream())); - assertEquals("200", + new AwWebResourceResponse("text/html", "UTF-8", new EmptyInputStream())); + assertEquals("\"[200][OK]\"", + executeJavaScriptAndWaitForResult(mAwContents, mContentsClient, syncGetJs)); + + mShouldInterceptRequestHelper.setReturnValue( + new AwWebResourceResponse("text/html", "UTF-8", new EmptyInputStream(), + teapotStatusCode, teapotResponsePhrase, new HashMap<String, String>())); + assertEquals("\"[" + teapotStatusCode + "][" + teapotResponsePhrase + "]\"", executeJavaScriptAndWaitForResult(mAwContents, mContentsClient, syncGetJs)); } - @SmallTest - @Feature({"AndroidWebView"}) - public void testHttpResponseClientHeader() throws Throwable { - final String clientResponseHeaderName = "Client-Via"; - // JSON stringification applied by executeJavaScriptAndWaitForResult adds quotes - // around returned strings. - final String clientResponseHeaderValue = "\"shouldInterceptRequest\""; - final String syncGetUrl = mWebServer.getResponseUrl("/intercept_me"); + private String getHeaderValue(AwContents awContents, TestAwContentsClient contentsClient, + String url, String headerName) throws Exception { final String syncGetJs = "(function() {" + " var xhr = new XMLHttpRequest();" + - " xhr.open('GET', '" + syncGetUrl + "', false);" + + " xhr.open('GET', '" + url + "', false);" + " xhr.send(null);" + " console.info(xhr.getAllResponseHeaders());" + - " return xhr.getResponseHeader('" + clientResponseHeaderName + "');" + + " return xhr.getResponseHeader('" + headerName + "');" + "})();"; + String header = executeJavaScriptAndWaitForResult(awContents, contentsClient, syncGetJs); + // JSON stringification applied by executeJavaScriptAndWaitForResult adds quotes + // around returned strings. + assertTrue(header.length() > 2); + assertEquals('"', header.charAt(0)); + assertEquals('"', header.charAt(header.length() - 1)); + return header.substring(1, header.length() - 1); + } + + @SmallTest + @Feature({"AndroidWebView"}) + public void testHttpResponseClientViaHeader() throws Throwable { + final String clientResponseHeaderName = "Client-Via"; + final String clientResponseHeaderValue = "shouldInterceptRequest"; + final String syncGetUrl = mWebServer.getResponseUrl("/intercept_me"); enableJavaScriptOnUiThread(mAwContents); final String aboutPageUrl = addAboutPageToTestServer(mWebServer); @@ -367,15 +487,34 @@ public class AwContentsClientShouldInterceptRequestTest extends AwTestBase { // The response header is set regardless of whether the embedder has provided a // valid resource stream. mShouldInterceptRequestHelper.setReturnValue( - new InterceptedRequestData("text/html", "UTF-8", null)); + new AwWebResourceResponse("text/html", "UTF-8", null)); assertEquals(clientResponseHeaderValue, - executeJavaScriptAndWaitForResult(mAwContents, mContentsClient, syncGetJs)); + getHeaderValue(mAwContents, mContentsClient, syncGetUrl, clientResponseHeaderName)); mShouldInterceptRequestHelper.setReturnValue( - new InterceptedRequestData("text/html", "UTF-8", new EmptyInputStream())); + new AwWebResourceResponse("text/html", "UTF-8", new EmptyInputStream())); assertEquals(clientResponseHeaderValue, - executeJavaScriptAndWaitForResult(mAwContents, mContentsClient, syncGetJs)); + getHeaderValue(mAwContents, mContentsClient, syncGetUrl, clientResponseHeaderName)); + } + @SmallTest + @Feature({"AndroidWebView"}) + public void testHttpResponseHeader() throws Throwable { + final String clientResponseHeaderName = "X-Test-Header-Name"; + final String clientResponseHeaderValue = "TestHeaderValue"; + final String syncGetUrl = mWebServer.getResponseUrl("/intercept_me"); + final Map<String, String> headers = new HashMap<String, String>(); + headers.put(clientResponseHeaderName, clientResponseHeaderValue); + enableJavaScriptOnUiThread(mAwContents); + + final String aboutPageUrl = addAboutPageToTestServer(mWebServer); + loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), aboutPageUrl); + + mShouldInterceptRequestHelper.setReturnValue( + new AwWebResourceResponse("text/html", "UTF-8", null, 0, null, headers)); + assertEquals(clientResponseHeaderValue, + getHeaderValue(mAwContents, mContentsClient, syncGetUrl, clientResponseHeaderName)); + } private String makePageWithTitle(String title) { return CommonResources.makeHtmlPageFrom("<title>" + title + "</title>", @@ -389,7 +528,7 @@ public class AwContentsClientShouldInterceptRequestTest extends AwTestBase { final String expectedPage = makePageWithTitle(expectedTitle); mShouldInterceptRequestHelper.setReturnValue( - stringToInterceptedRequestData(expectedPage)); + stringToAwWebResourceResponse(expectedPage)); final String aboutPageUrl = addAboutPageToTestServer(mWebServer); @@ -403,7 +542,7 @@ public class AwContentsClientShouldInterceptRequestTest extends AwTestBase { @Feature({"AndroidWebView"}) public void testDoesNotChangeReportedUrl() throws Throwable { mShouldInterceptRequestHelper.setReturnValue( - stringToInterceptedRequestData(makePageWithTitle("some title"))); + stringToAwWebResourceResponse(makePageWithTitle("some title"))); final String aboutPageUrl = addAboutPageToTestServer(mWebServer); @@ -420,7 +559,7 @@ public class AwContentsClientShouldInterceptRequestTest extends AwTestBase { mContentsClient.getOnReceivedErrorHelper(); mShouldInterceptRequestHelper.setReturnValue( - new InterceptedRequestData("text/html", "UTF-8", null)); + new AwWebResourceResponse("text/html", "UTF-8", null)); final String aboutPageUrl = addAboutPageToTestServer(mWebServer); final int callCount = onReceivedErrorHelper.getCallCount(); @@ -451,7 +590,7 @@ public class AwContentsClientShouldInterceptRequestTest extends AwTestBase { @SmallTest @Feature({"AndroidWebView"}) public void testOnReceivedErrorCallback() throws Throwable { - mShouldInterceptRequestHelper.setReturnValue(new InterceptedRequestData(null, null, null)); + mShouldInterceptRequestHelper.setReturnValue(new AwWebResourceResponse(null, null, null)); OnReceivedErrorHelper onReceivedErrorHelper = mContentsClient.getOnReceivedErrorHelper(); int onReceivedErrorHelperCallCount = onReceivedErrorHelper.getCallCount(); loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), "foo://bar"); @@ -468,7 +607,7 @@ public class AwContentsClientShouldInterceptRequestTest extends AwTestBase { addPageToTestServer(mWebServer, "/page_with_image.html", CommonResources.getOnImageLoadedHtml(CommonResources.FAVICON_FILENAME)); mShouldInterceptRequestHelper.setReturnValueForUrl( - imageUrl, new InterceptedRequestData(null, null, null)); + imageUrl, new AwWebResourceResponse(null, null, null)); OnReceivedErrorHelper onReceivedErrorHelper = mContentsClient.getOnReceivedErrorHelper(); int onReceivedErrorHelperCallCount = onReceivedErrorHelper.getCallCount(); loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), pageWithImage); @@ -479,12 +618,12 @@ public class AwContentsClientShouldInterceptRequestTest extends AwTestBase { @Feature({"AndroidWebView"}) public void testCalledForIframe() throws Throwable { final String aboutPageUrl = addAboutPageToTestServer(mWebServer); - final String pageWithIframe = addPageToTestServer(mWebServer, "/page_with_iframe.html", + final String pageWithIframeUrl = addPageToTestServer(mWebServer, "/page_with_iframe.html", CommonResources.makeHtmlPageFrom("", "<iframe src=\"" + aboutPageUrl + "\"/>")); int callCount = mShouldInterceptRequestHelper.getCallCount(); - loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), pageWithIframe); + loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), pageWithIframeUrl); mShouldInterceptRequestHelper.waitForCallback(callCount, 2); assertEquals(2, mShouldInterceptRequestHelper.getUrls().size()); assertEquals(aboutPageUrl, mShouldInterceptRequestHelper.getUrls().get(1)); diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java index 5ccc6ebb3d..8656e4266f 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java @@ -64,15 +64,12 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase { }); } - private String makeHtmlPageFrom(String headers, String body) { - return CommonResources.makeHtmlPageFrom("<title>" + TITLE + "</title> " + headers, body); + private String getTestPageCommonHeaders() { + return "<title>" + TITLE + "</title> "; } - private String getHtmlForPageWithSimpleLinkTo(String destination) { - return makeHtmlPageFrom("", - "<a href=\"" + destination + "\" id=\"link\">" + - "<img class=\"big\" />" + - "</a>"); + private String makeHtmlPageFrom(String headers, String body) { + return CommonResources.makeHtmlPageFrom(getTestPageCommonHeaders() + headers, body); } private String getHtmlForPageWithJsAssignLinkTo(String url) { @@ -104,13 +101,6 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase { method, timeout)); } - private String getHtmlForPageWithSimplePostFormTo(String destination) { - return makeHtmlPageFrom("", - "<form action=\"" + destination + "\" method=\"post\">" + - "<input type=\"submit\" value=\"post\" id=\"link\">" + - "</form>"); - } - private String addPageToTestServer(TestWebServer webServer, String httpPath, String html) { List<Pair<String, String>> headers = new ArrayList<Pair<String, String>>(); headers.add(Pair.create("Content-Type", "text/html")); @@ -134,7 +124,7 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase { contentsClient.getShouldOverrideUrlLoadingHelper(); loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(), - getHtmlForPageWithSimpleLinkTo(DATA_URL), "text/html", false); + CommonResources.makeHtmlPageWithSimpleLinkTo(DATA_URL), "text/html", false); assertEquals(0, shouldOverrideUrlLoadingHelper.getCallCount()); } @@ -217,7 +207,8 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase { setShouldOverrideUrlLoadingReturnValueOnUiThread(shouldOverrideUrlLoadingHelper, true); loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(), - getHtmlForPageWithSimpleLinkTo(DATA_URL), "text/html", false); + CommonResources.makeHtmlPageWithSimpleLinkTo(getTestPageCommonHeaders(), + DATA_URL), "text/html", false); assertEquals(TITLE, getTitleOnUiThread(awContents)); } @@ -234,7 +225,7 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase { OnPageStartedHelper onPageStartedHelper = contentsClient.getOnPageStartedHelper(); loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(), - getHtmlForPageWithSimpleLinkTo(DATA_URL), "text/html", false); + CommonResources.makeHtmlPageWithSimpleLinkTo(DATA_URL), "text/html", false); final int shouldOverrideUrlLoadingCallCount = shouldOverrideUrlLoadingHelper.getCallCount(); final int onPageStartedCallCount = onPageStartedHelper.getCallCount(); @@ -259,7 +250,7 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase { final int onReceivedErrorCallCount = onReceivedErrorHelper.getCallCount(); loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(), - getHtmlForPageWithSimpleLinkTo(DATA_URL), "text/html", false); + CommonResources.makeHtmlPageWithSimpleLinkTo(DATA_URL), "text/html", false); final int shouldOverrideUrlLoadingCallCount = shouldOverrideUrlLoadingHelper.getCallCount(); @@ -301,11 +292,11 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase { final String anchorLinkPath = "/anchor_link.html"; final String anchorLinkUrl = mWebServer.getResponseUrl(anchorLinkPath); addPageToTestServer(mWebServer, anchorLinkPath, - getHtmlForPageWithSimpleLinkTo(anchorLinkUrl + "#anchor")); + CommonResources.makeHtmlPageWithSimpleLinkTo(anchorLinkUrl + "#anchor")); if (useLoadData) { loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(), - getHtmlForPageWithSimpleLinkTo("#anchor"), "text/html", false); + CommonResources.makeHtmlPageWithSimpleLinkTo("#anchor"), "text/html", false); } else { loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(), anchorLinkUrl); } @@ -335,7 +326,7 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase { // We can't go to about:blank from here because we'd get a cross-origin error. loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(), - getHtmlForPageWithSimpleLinkTo(DATA_URL), "text/html", false); + CommonResources.makeHtmlPageWithSimpleLinkTo(DATA_URL), "text/html", false); int callCount = shouldOverrideUrlLoadingHelper.getCallCount(); @@ -357,7 +348,7 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase { final String httpPath = "/page_with_about_blank_navigation"; final String httpPathOnServer = mWebServer.getResponseUrl(httpPath); addPageToTestServer(mWebServer, httpPath, - getHtmlForPageWithSimpleLinkTo(ABOUT_BLANK_URL)); + CommonResources.makeHtmlPageWithSimpleLinkTo(ABOUT_BLANK_URL)); loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(), httpPathOnServer); @@ -384,7 +375,7 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase { final String httpPath = "/page_with_link_to_self.html"; final String httpPathOnServer = mWebServer.getResponseUrl(httpPath); addPageToTestServer(mWebServer, httpPath, - getHtmlForPageWithSimpleLinkTo(httpPathOnServer)); + CommonResources.makeHtmlPageWithSimpleLinkTo(httpPathOnServer)); loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(), httpPathOnServer); @@ -454,7 +445,8 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase { final String redirectTargetUrl = createRedirectTargetPage(mWebServer); loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(), - getHtmlForPageWithSimpleLinkTo(redirectTargetUrl), "text/html", false); + CommonResources.makeHtmlPageWithSimpleLinkTo(redirectTargetUrl), "text/html", + false); int callCount = shouldOverrideUrlLoadingHelper.getCallCount(); clickOnLinkUsingJs(awContents, contentsClient); @@ -477,11 +469,11 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase { final String pageWithLinkToIgnorePath = "/page_with_link_to_ignore.html"; final String pageWithLinkToIgnoreUrl = addPageToTestServer(mWebServer, pageWithLinkToIgnorePath, - getHtmlForPageWithSimpleLinkTo(redirectTargetUrl)); + CommonResources.makeHtmlPageWithSimpleLinkTo(redirectTargetUrl)); final String synchronizationPath = "/sync.html"; final String synchronizationUrl = addPageToTestServer(mWebServer, synchronizationPath, - getHtmlForPageWithSimpleLinkTo(redirectTargetUrl)); + CommonResources.makeHtmlPageWithSimpleLinkTo(redirectTargetUrl)); loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(), pageWithLinkToIgnoreUrl); @@ -518,7 +510,7 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase { TestAwContentsClient.ShouldOverrideUrlLoadingHelper shouldOverrideUrlLoadingHelper = contentsClient.getShouldOverrideUrlLoadingHelper(); loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(), - getHtmlForPageWithSimpleLinkTo(dataUrl), "text/html", false); + CommonResources.makeHtmlPageWithSimpleLinkTo(dataUrl), "text/html", false); int callCount = shouldOverrideUrlLoadingHelper.getCallCount(); clickOnLinkUsingJs(awContents, contentsClient); @@ -541,7 +533,8 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase { contentsClient.getShouldOverrideUrlLoadingHelper(); final String unsupportedSchemeUrl = "foobar://resource/1"; loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(), - getHtmlForPageWithSimpleLinkTo(unsupportedSchemeUrl), "text/html", false); + CommonResources.makeHtmlPageWithSimpleLinkTo(unsupportedSchemeUrl), "text/html", + false); int callCount = shouldOverrideUrlLoadingHelper.getCallCount(); clickOnLinkUsingJs(awContents, contentsClient); @@ -564,7 +557,7 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase { final String redirectTargetUrl = createRedirectTargetPage(mWebServer); final String postLinkUrl = addPageToTestServer(mWebServer, "/page_with_post_link.html", - getHtmlForPageWithSimplePostFormTo(redirectTargetUrl)); + CommonResources.makeHtmlPageWithSimplePostFormTo(redirectTargetUrl)); loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(), postLinkUrl); @@ -603,7 +596,7 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase { final String redirectTargetUrl = createRedirectTargetPage(mWebServer); final String postToGetRedirectUrl = mWebServer.setRedirect("/302.html", redirectTargetUrl); final String postLinkUrl = addPageToTestServer(mWebServer, "/page_with_post_link.html", - getHtmlForPageWithSimplePostFormTo(postToGetRedirectUrl)); + CommonResources.makeHtmlPageWithSimplePostFormTo(postToGetRedirectUrl)); loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(), postLinkUrl); @@ -702,7 +695,7 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase { final AwContents awContents = testContainerView.getAwContents(); final String pageWithLinkToRedirectUrl = addPageToTestServer(webServer, "/page_with_link_to_redirect.html", - getHtmlForPageWithSimpleLinkTo(redirectUrl)); + CommonResources.makeHtmlPageWithSimpleLinkTo(redirectUrl)); enableJavaScriptOnUiThread(awContents); TestAwContentsClient.ShouldOverrideUrlLoadingHelper shouldOverrideUrlLoadingHelper = @@ -813,7 +806,8 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase { @Override public void run() { awContents.loadUrl(LoadUrlParams.createLoadDataParams( - getHtmlForPageWithSimpleLinkTo(DATA_URL), "text/html", false)); + CommonResources.makeHtmlPageWithSimpleLinkTo(DATA_URL), "text/html", + false)); awContents.loadUrl(new LoadUrlParams(jsUrl)); } }); diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java index 4943bf8d9c..d6ac546f06 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java @@ -21,9 +21,10 @@ import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout; import org.apache.http.Header; import org.apache.http.HttpRequest; import org.chromium.android_webview.AwContents; +import org.chromium.android_webview.AwContentsClient.ShouldInterceptRequestParams; import org.chromium.android_webview.AwSettings; import org.chromium.android_webview.AwSettings.LayoutAlgorithm; -import org.chromium.android_webview.InterceptedRequestData; +import org.chromium.android_webview.AwWebResourceResponse; import org.chromium.android_webview.test.util.CommonResources; import org.chromium.android_webview.test.util.ImagePageGenerator; import org.chromium.android_webview.test.util.VideoTestUtil; @@ -1782,8 +1783,10 @@ public class AwSettingsTest extends AwTestBase { views.getContainer1(), views.getClient1(), 1)); } - @SmallTest - @Feature({"AndroidWebView", "Preferences"}) + // @SmallTest + // @Feature({"AndroidWebView", "Preferences"}) + // http://crbug.com/387101 + @DisabledTest public void testBlockNetworkImagesDoesNotBlockDataUrlImage() throws Throwable { final TestAwContentsClient contentClient = new TestAwContentsClient(); final AwTestContainerView testContainerView = @@ -2568,8 +2571,9 @@ public class AwSettingsTest extends AwTestBase { final String DEFAULT_VIDEO_POSTER_URL = "http://default_video_poster/"; TestAwContentsClient client = new TestAwContentsClient() { @Override - public InterceptedRequestData shouldInterceptRequest(String url) { - if (url.equals(DEFAULT_VIDEO_POSTER_URL)) { + public AwWebResourceResponse shouldInterceptRequest( + ShouldInterceptRequestParams params) { + if (params.url.equals(DEFAULT_VIDEO_POSTER_URL)) { videoPosterAccessedCallbackHelper.notifyCalled(); } return null; diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java index 15c0bcd78e..5f9c51b632 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java @@ -9,6 +9,7 @@ import android.test.suitebuilder.annotation.MediumTest; import org.chromium.android_webview.AwContents; import org.chromium.android_webview.test.util.CommonResources; import org.chromium.android_webview.test.util.JSUtils; +import org.chromium.base.test.util.DisabledTest; import org.chromium.base.test.util.Feature; import org.chromium.content.browser.test.util.TestCallbackHelperContainer; import org.chromium.net.test.util.TestWebServer; @@ -48,8 +49,13 @@ public class ClientOnPageFinishedTest extends AwTestBase { assertEquals("data:text/html," + html, onPageFinishedHelper.getUrl()); } - @MediumTest - @Feature({"AndroidWebView"}) + /** + * @MediumTest + * @Feature({"AndroidWebView"}) + * + * http://crbug.com/386300 + */ + @DisabledTest public void testOnPageFinishedCalledAfterError() throws Throwable { class LocalTestClient extends TestAwContentsClient { private boolean isOnReceivedErrorCalled = false; diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerStartupTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerStartupTest.java index d365319b02..9f597e6b7d 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerStartupTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerStartupTest.java @@ -11,7 +11,7 @@ import android.test.suitebuilder.annotation.SmallTest; import org.chromium.android_webview.AwBrowserProcess; import org.chromium.android_webview.AwContents; import org.chromium.android_webview.AwCookieManager; -import org.chromium.android_webview.InterceptedRequestData; +import org.chromium.android_webview.AwWebResourceResponse; import org.chromium.android_webview.test.util.CommonResources; import org.chromium.android_webview.test.util.CookieUtils; import org.chromium.base.test.util.Feature; @@ -120,7 +120,8 @@ public class CookieManagerStartupTest extends AwTestBase { String url = "http://www.example.com"; TestAwContentsClient contentsClient = new TestAwContentsClient() { @Override - public InterceptedRequestData shouldInterceptRequest(String url) { + public AwWebResourceResponse shouldInterceptRequest( + ShouldInterceptRequestParams params) { (new AwCookieManager()).getCookie("www.example.com"); return null; } diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/KeySystemTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/KeySystemTest.java index f3dd6ce702..b884b920d8 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/KeySystemTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/KeySystemTest.java @@ -5,6 +5,7 @@ package org.chromium.android_webview.test; import android.test.suitebuilder.annotation.SmallTest; + import org.chromium.android_webview.AwContents; import org.chromium.base.test.util.DisabledTest; import org.chromium.base.test.util.Feature; @@ -65,4 +66,10 @@ public class KeySystemTest extends AwTestBase { public void testNotSupportFooKeySystem() throws Throwable { assertEquals("\"\"", IsKeySystemSupported("com.foo.keysystem")); } + + @Feature({"AndroidWebView"}) + @SmallTest + public void testSupportPlatformKeySystem() throws Throwable { + assertEquals("\"maybe\"", IsKeySystemSupported("com.oem.test-keysystem")); + } } diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/util/CommonResources.java b/android_webview/javatests/src/org/chromium/android_webview/test/util/CommonResources.java index 5fae61ca79..2f8e900392 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/util/CommonResources.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/util/CommonResources.java @@ -105,4 +105,22 @@ public class CommonResources { "</body>" + "</html>"; } + + public static String makeHtmlPageWithSimpleLinkTo(String headers, String destination) { + return makeHtmlPageFrom(headers, + "<a href=\"" + destination + "\" id=\"link\">" + + "<img class=\"big\" />" + + "</a>"); + } + + public static String makeHtmlPageWithSimpleLinkTo(String destination) { + return makeHtmlPageWithSimpleLinkTo("", destination); + } + + public static String makeHtmlPageWithSimplePostFormTo(String destination) { + return makeHtmlPageFrom("", + "<form action=\"" + destination + "\" method=\"post\">" + + "<input type=\"submit\" value=\"post\" id=\"link\">" + + "</form>"); + } } diff --git a/android_webview/libwebviewchromium.target.darwin-arm.mk b/android_webview/libwebviewchromium.target.darwin-arm.mk index 0f24b754fc..f0c6fee6b0 100644 --- a/android_webview/libwebviewchromium.target.darwin-arm.mk +++ b/android_webview/libwebviewchromium.target.darwin-arm.mk @@ -444,6 +444,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' \ @@ -551,6 +552,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' \ diff --git a/android_webview/libwebviewchromium.target.darwin-arm64.mk b/android_webview/libwebviewchromium.target.darwin-arm64.mk index edfbf9b214..c72e674853 100644 --- a/android_webview/libwebviewchromium.target.darwin-arm64.mk +++ b/android_webview/libwebviewchromium.target.darwin-arm64.mk @@ -417,6 +417,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' \ @@ -513,6 +514,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' \ diff --git a/android_webview/libwebviewchromium.target.darwin-mips.mk b/android_webview/libwebviewchromium.target.darwin-mips.mk index 1280fec79e..77d681bedb 100644 --- a/android_webview/libwebviewchromium.target.darwin-mips.mk +++ b/android_webview/libwebviewchromium.target.darwin-mips.mk @@ -419,6 +419,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' \ @@ -520,6 +521,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' \ diff --git a/android_webview/libwebviewchromium.target.darwin-x86.mk b/android_webview/libwebviewchromium.target.darwin-x86.mk index 5898bef1e8..b15906ec42 100644 --- a/android_webview/libwebviewchromium.target.darwin-x86.mk +++ b/android_webview/libwebviewchromium.target.darwin-x86.mk @@ -436,6 +436,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' \ @@ -537,6 +538,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' \ diff --git a/android_webview/libwebviewchromium.target.darwin-x86_64.mk b/android_webview/libwebviewchromium.target.darwin-x86_64.mk index bb391f207e..62992956f6 100644 --- a/android_webview/libwebviewchromium.target.darwin-x86_64.mk +++ b/android_webview/libwebviewchromium.target.darwin-x86_64.mk @@ -435,6 +435,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' \ @@ -535,6 +536,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' \ diff --git a/android_webview/libwebviewchromium.target.linux-arm.mk b/android_webview/libwebviewchromium.target.linux-arm.mk index 0f24b754fc..f0c6fee6b0 100644 --- a/android_webview/libwebviewchromium.target.linux-arm.mk +++ b/android_webview/libwebviewchromium.target.linux-arm.mk @@ -444,6 +444,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' \ @@ -551,6 +552,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' \ diff --git a/android_webview/libwebviewchromium.target.linux-arm64.mk b/android_webview/libwebviewchromium.target.linux-arm64.mk index edfbf9b214..c72e674853 100644 --- a/android_webview/libwebviewchromium.target.linux-arm64.mk +++ b/android_webview/libwebviewchromium.target.linux-arm64.mk @@ -417,6 +417,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' \ @@ -513,6 +514,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' \ diff --git a/android_webview/libwebviewchromium.target.linux-mips.mk b/android_webview/libwebviewchromium.target.linux-mips.mk index 1280fec79e..77d681bedb 100644 --- a/android_webview/libwebviewchromium.target.linux-mips.mk +++ b/android_webview/libwebviewchromium.target.linux-mips.mk @@ -419,6 +419,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' \ @@ -520,6 +521,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' \ diff --git a/android_webview/libwebviewchromium.target.linux-x86.mk b/android_webview/libwebviewchromium.target.linux-x86.mk index 5898bef1e8..b15906ec42 100644 --- a/android_webview/libwebviewchromium.target.linux-x86.mk +++ b/android_webview/libwebviewchromium.target.linux-x86.mk @@ -436,6 +436,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' \ @@ -537,6 +538,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' \ diff --git a/android_webview/libwebviewchromium.target.linux-x86_64.mk b/android_webview/libwebviewchromium.target.linux-x86_64.mk index bb391f207e..62992956f6 100644 --- a/android_webview/libwebviewchromium.target.linux-x86_64.mk +++ b/android_webview/libwebviewchromium.target.linux-x86_64.mk @@ -435,6 +435,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' \ @@ -535,6 +536,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' \ diff --git a/android_webview/native/android_protocol_handler.cc b/android_webview/native/android_protocol_handler.cc index ac57ae9834..bc25e3662a 100644 --- a/android_webview/native/android_protocol_handler.cc +++ b/android_webview/native/android_protocol_handler.cc @@ -77,6 +77,10 @@ class AndroidStreamReaderURLRequestJobDelegateImpl InputStream* stream, std::string* charset) OVERRIDE; + virtual void AppendResponseHeaders( + JNIEnv* env, + net::HttpResponseHeaders* headers) OVERRIDE; + virtual ~AndroidStreamReaderURLRequestJobDelegateImpl(); }; @@ -198,6 +202,12 @@ bool AndroidStreamReaderURLRequestJobDelegateImpl::GetCharset( return false; } +void AndroidStreamReaderURLRequestJobDelegateImpl::AppendResponseHeaders( + JNIEnv* env, + net::HttpResponseHeaders* headers) { + // no-op +} + // AndroidRequestInterceptorBase ---------------------------------------------- net::URLRequestJob* AndroidRequestInterceptorBase::MaybeInterceptRequest( diff --git a/android_webview/native/android_webview_jni_registrar.cc b/android_webview/native/android_webview_jni_registrar.cc index 3f2e85b5de..8db97137c7 100644 --- a/android_webview/native/android_webview_jni_registrar.cc +++ b/android_webview/native/android_webview_jni_registrar.cc @@ -19,10 +19,10 @@ #include "android_webview/native/aw_resource.h" #include "android_webview/native/aw_settings.h" #include "android_webview/native/aw_web_contents_delegate.h" +#include "android_webview/native/aw_web_resource_response_impl.h" #include "android_webview/native/cookie_manager.h" #include "android_webview/native/external_video_surface_container_impl.h" #include "android_webview/native/input_stream_impl.h" -#include "android_webview/native/intercepted_request_data_impl.h" #include "android_webview/native/java_browser_view_renderer_helper.h" #include "android_webview/native/permission/aw_permission_request.h" #include "base/android/jni_android.h" @@ -53,7 +53,7 @@ static base::android::RegistrationMethod kWebViewRegisteredMethods[] = { #if defined(VIDEO_HOLE) { "ExternalVideoSurfaceContainer", RegisterExternalVideoSurfaceContainer }, #endif - { "InterceptedRequestDataImpl", RegisterInterceptedRequestData }, + { "AwWebResourceResponseImpl", RegisterAwWebResourceResponse }, { "InputStream", RegisterInputStream }, { "JavaBrowserViewRendererHelper", RegisterJavaBrowserViewRendererHelper }, }; diff --git a/android_webview/native/android_webview_native_jni.target.darwin-arm.mk b/android_webview/native/android_webview_native_jni.target.darwin-arm.mk index afb8b32b82..047287b094 100644 --- a/android_webview/native/android_webview_native_jni.target.darwin-arm.mk +++ b/android_webview/native/android_webview_native_jni.target.darwin-arm.mk @@ -18,7 +18,7 @@ GYP_TARGET_DEPENDENCIES := \ ### Generated for rule "android_webview_native_webview_native_gyp_android_webview_native_jni_target_generate_jni_headers": -# "{'inputs': ['../../base/android/jni_generator/jni_generator.py', '../../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/android_webview/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['../java/src/org/chromium/android_webview/AndroidProtocolHandler.java', '../java/src/org/chromium/android_webview/AwAutofillClient.java', '../java/src/org/chromium/android_webview/AwContents.java', '../java/src/org/chromium/android_webview/AwContentsClientBridge.java', '../java/src/org/chromium/android_webview/AwContentsIoThreadClient.java', '../java/src/org/chromium/android_webview/AwContentsStatics.java', '../java/src/org/chromium/android_webview/AwCookieManager.java', '../java/src/org/chromium/android_webview/AwDevToolsServer.java', '../java/src/org/chromium/android_webview/AwFormDatabase.java', '../java/src/org/chromium/android_webview/AwHttpAuthHandler.java', '../java/src/org/chromium/android_webview/AwPdfExporter.java', '../java/src/org/chromium/android_webview/AwPicture.java', '../java/src/org/chromium/android_webview/AwQuotaManagerBridge.java', '../java/src/org/chromium/android_webview/AwResource.java', '../java/src/org/chromium/android_webview/AwSettings.java', '../java/src/org/chromium/android_webview/AwWebContentsDelegate.java', '../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java', '../java/src/org/chromium/android_webview/InterceptedRequestData.java', '../java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java', '../java/src/org/chromium/android_webview/permission/AwPermissionRequest.java'], 'action': ['../../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/android_webview/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": +# "{'inputs': ['../../base/android/jni_generator/jni_generator.py', '../../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/android_webview/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['../java/src/org/chromium/android_webview/AndroidProtocolHandler.java', '../java/src/org/chromium/android_webview/AwAutofillClient.java', '../java/src/org/chromium/android_webview/AwContents.java', '../java/src/org/chromium/android_webview/AwContentsClientBridge.java', '../java/src/org/chromium/android_webview/AwContentsIoThreadClient.java', '../java/src/org/chromium/android_webview/AwContentsStatics.java', '../java/src/org/chromium/android_webview/AwCookieManager.java', '../java/src/org/chromium/android_webview/AwDevToolsServer.java', '../java/src/org/chromium/android_webview/AwFormDatabase.java', '../java/src/org/chromium/android_webview/AwHttpAuthHandler.java', '../java/src/org/chromium/android_webview/AwPdfExporter.java', '../java/src/org/chromium/android_webview/AwPicture.java', '../java/src/org/chromium/android_webview/AwQuotaManagerBridge.java', '../java/src/org/chromium/android_webview/AwResource.java', '../java/src/org/chromium/android_webview/AwSettings.java', '../java/src/org/chromium/android_webview/AwWebContentsDelegate.java', '../java/src/org/chromium/android_webview/AwWebResourceResponse.java', '../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java', '../java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java', '../java/src/org/chromium/android_webview/permission/AwPermissionRequest.java'], 'action': ['../../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/android_webview/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -163,6 +163,15 @@ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h: mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/AwWebContentsDelegate.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: $(LOCAL_PATH)/android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java $(LOCAL_PATH)/base/android/jni_generator/jni_generator.py $(LOCAL_PATH)/android_webview/build/jarjar-rules.txt $(GYP_TARGET_DEPENDENCIES) + mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/AwWebResourceResponse.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long + + $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -172,15 +181,6 @@ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_local_path := $(LOCAL_PATH) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: $(LOCAL_PATH)/android_webview/java/src/org/chromium/android_webview/InterceptedRequestData.java $(LOCAL_PATH)/base/android/jni_generator/jni_generator.py $(LOCAL_PATH)/android_webview/build/jarjar-rules.txt $(GYP_TARGET_DEPENDENCIES) - mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/InterceptedRequestData.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long - - $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -217,8 +217,8 @@ GYP_GENERATED_OUTPUTS := \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwResource_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwSettings_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h \ + $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h \ - $(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwPermissionRequest_jni.h @@ -242,8 +242,8 @@ LOCAL_GENERATED_SOURCES := \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwResource_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwSettings_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h \ + $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h \ - $(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwPermissionRequest_jni.h @@ -315,6 +315,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -412,6 +413,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/android_webview_native_jni.target.darwin-arm64.mk b/android_webview/native/android_webview_native_jni.target.darwin-arm64.mk index 019c36715b..a239b07037 100644 --- a/android_webview/native/android_webview_native_jni.target.darwin-arm64.mk +++ b/android_webview/native/android_webview_native_jni.target.darwin-arm64.mk @@ -18,7 +18,7 @@ GYP_TARGET_DEPENDENCIES := \ ### Generated for rule "android_webview_native_webview_native_gyp_android_webview_native_jni_target_generate_jni_headers": -# "{'inputs': ['../../base/android/jni_generator/jni_generator.py', '../../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/android_webview/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['../java/src/org/chromium/android_webview/AndroidProtocolHandler.java', '../java/src/org/chromium/android_webview/AwAutofillClient.java', '../java/src/org/chromium/android_webview/AwContents.java', '../java/src/org/chromium/android_webview/AwContentsClientBridge.java', '../java/src/org/chromium/android_webview/AwContentsIoThreadClient.java', '../java/src/org/chromium/android_webview/AwContentsStatics.java', '../java/src/org/chromium/android_webview/AwCookieManager.java', '../java/src/org/chromium/android_webview/AwDevToolsServer.java', '../java/src/org/chromium/android_webview/AwFormDatabase.java', '../java/src/org/chromium/android_webview/AwHttpAuthHandler.java', '../java/src/org/chromium/android_webview/AwPdfExporter.java', '../java/src/org/chromium/android_webview/AwPicture.java', '../java/src/org/chromium/android_webview/AwQuotaManagerBridge.java', '../java/src/org/chromium/android_webview/AwResource.java', '../java/src/org/chromium/android_webview/AwSettings.java', '../java/src/org/chromium/android_webview/AwWebContentsDelegate.java', '../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java', '../java/src/org/chromium/android_webview/InterceptedRequestData.java', '../java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java', '../java/src/org/chromium/android_webview/permission/AwPermissionRequest.java'], 'action': ['../../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/android_webview/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": +# "{'inputs': ['../../base/android/jni_generator/jni_generator.py', '../../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/android_webview/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['../java/src/org/chromium/android_webview/AndroidProtocolHandler.java', '../java/src/org/chromium/android_webview/AwAutofillClient.java', '../java/src/org/chromium/android_webview/AwContents.java', '../java/src/org/chromium/android_webview/AwContentsClientBridge.java', '../java/src/org/chromium/android_webview/AwContentsIoThreadClient.java', '../java/src/org/chromium/android_webview/AwContentsStatics.java', '../java/src/org/chromium/android_webview/AwCookieManager.java', '../java/src/org/chromium/android_webview/AwDevToolsServer.java', '../java/src/org/chromium/android_webview/AwFormDatabase.java', '../java/src/org/chromium/android_webview/AwHttpAuthHandler.java', '../java/src/org/chromium/android_webview/AwPdfExporter.java', '../java/src/org/chromium/android_webview/AwPicture.java', '../java/src/org/chromium/android_webview/AwQuotaManagerBridge.java', '../java/src/org/chromium/android_webview/AwResource.java', '../java/src/org/chromium/android_webview/AwSettings.java', '../java/src/org/chromium/android_webview/AwWebContentsDelegate.java', '../java/src/org/chromium/android_webview/AwWebResourceResponse.java', '../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java', '../java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java', '../java/src/org/chromium/android_webview/permission/AwPermissionRequest.java'], 'action': ['../../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/android_webview/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -163,6 +163,15 @@ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h: mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/AwWebContentsDelegate.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: $(LOCAL_PATH)/android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java $(LOCAL_PATH)/base/android/jni_generator/jni_generator.py $(LOCAL_PATH)/android_webview/build/jarjar-rules.txt $(GYP_TARGET_DEPENDENCIES) + mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/AwWebResourceResponse.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long + + $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -172,15 +181,6 @@ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_local_path := $(LOCAL_PATH) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: $(LOCAL_PATH)/android_webview/java/src/org/chromium/android_webview/InterceptedRequestData.java $(LOCAL_PATH)/base/android/jni_generator/jni_generator.py $(LOCAL_PATH)/android_webview/build/jarjar-rules.txt $(GYP_TARGET_DEPENDENCIES) - mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/InterceptedRequestData.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long - - $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -217,8 +217,8 @@ GYP_GENERATED_OUTPUTS := \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwResource_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwSettings_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h \ + $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h \ - $(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwPermissionRequest_jni.h @@ -242,8 +242,8 @@ LOCAL_GENERATED_SOURCES := \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwResource_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwSettings_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h \ + $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h \ - $(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwPermissionRequest_jni.h @@ -305,6 +305,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -391,6 +392,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/android_webview_native_jni.target.darwin-mips.mk b/android_webview/native/android_webview_native_jni.target.darwin-mips.mk index c3bc38a0bb..7317555e94 100644 --- a/android_webview/native/android_webview_native_jni.target.darwin-mips.mk +++ b/android_webview/native/android_webview_native_jni.target.darwin-mips.mk @@ -18,7 +18,7 @@ GYP_TARGET_DEPENDENCIES := \ ### Generated for rule "android_webview_native_webview_native_gyp_android_webview_native_jni_target_generate_jni_headers": -# "{'inputs': ['../../base/android/jni_generator/jni_generator.py', '../../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/android_webview/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['../java/src/org/chromium/android_webview/AndroidProtocolHandler.java', '../java/src/org/chromium/android_webview/AwAutofillClient.java', '../java/src/org/chromium/android_webview/AwContents.java', '../java/src/org/chromium/android_webview/AwContentsClientBridge.java', '../java/src/org/chromium/android_webview/AwContentsIoThreadClient.java', '../java/src/org/chromium/android_webview/AwContentsStatics.java', '../java/src/org/chromium/android_webview/AwCookieManager.java', '../java/src/org/chromium/android_webview/AwDevToolsServer.java', '../java/src/org/chromium/android_webview/AwFormDatabase.java', '../java/src/org/chromium/android_webview/AwHttpAuthHandler.java', '../java/src/org/chromium/android_webview/AwPdfExporter.java', '../java/src/org/chromium/android_webview/AwPicture.java', '../java/src/org/chromium/android_webview/AwQuotaManagerBridge.java', '../java/src/org/chromium/android_webview/AwResource.java', '../java/src/org/chromium/android_webview/AwSettings.java', '../java/src/org/chromium/android_webview/AwWebContentsDelegate.java', '../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java', '../java/src/org/chromium/android_webview/InterceptedRequestData.java', '../java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java', '../java/src/org/chromium/android_webview/permission/AwPermissionRequest.java'], 'action': ['../../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/android_webview/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": +# "{'inputs': ['../../base/android/jni_generator/jni_generator.py', '../../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/android_webview/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['../java/src/org/chromium/android_webview/AndroidProtocolHandler.java', '../java/src/org/chromium/android_webview/AwAutofillClient.java', '../java/src/org/chromium/android_webview/AwContents.java', '../java/src/org/chromium/android_webview/AwContentsClientBridge.java', '../java/src/org/chromium/android_webview/AwContentsIoThreadClient.java', '../java/src/org/chromium/android_webview/AwContentsStatics.java', '../java/src/org/chromium/android_webview/AwCookieManager.java', '../java/src/org/chromium/android_webview/AwDevToolsServer.java', '../java/src/org/chromium/android_webview/AwFormDatabase.java', '../java/src/org/chromium/android_webview/AwHttpAuthHandler.java', '../java/src/org/chromium/android_webview/AwPdfExporter.java', '../java/src/org/chromium/android_webview/AwPicture.java', '../java/src/org/chromium/android_webview/AwQuotaManagerBridge.java', '../java/src/org/chromium/android_webview/AwResource.java', '../java/src/org/chromium/android_webview/AwSettings.java', '../java/src/org/chromium/android_webview/AwWebContentsDelegate.java', '../java/src/org/chromium/android_webview/AwWebResourceResponse.java', '../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java', '../java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java', '../java/src/org/chromium/android_webview/permission/AwPermissionRequest.java'], 'action': ['../../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/android_webview/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -163,6 +163,15 @@ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h: mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/AwWebContentsDelegate.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: $(LOCAL_PATH)/android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java $(LOCAL_PATH)/base/android/jni_generator/jni_generator.py $(LOCAL_PATH)/android_webview/build/jarjar-rules.txt $(GYP_TARGET_DEPENDENCIES) + mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/AwWebResourceResponse.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long + + $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -172,15 +181,6 @@ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_local_path := $(LOCAL_PATH) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: $(LOCAL_PATH)/android_webview/java/src/org/chromium/android_webview/InterceptedRequestData.java $(LOCAL_PATH)/base/android/jni_generator/jni_generator.py $(LOCAL_PATH)/android_webview/build/jarjar-rules.txt $(GYP_TARGET_DEPENDENCIES) - mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/InterceptedRequestData.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long - - $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -217,8 +217,8 @@ GYP_GENERATED_OUTPUTS := \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwResource_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwSettings_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h \ + $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h \ - $(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwPermissionRequest_jni.h @@ -242,8 +242,8 @@ LOCAL_GENERATED_SOURCES := \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwResource_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwSettings_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h \ + $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h \ - $(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwPermissionRequest_jni.h @@ -309,6 +309,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -400,6 +401,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/android_webview_native_jni.target.darwin-x86.mk b/android_webview/native/android_webview_native_jni.target.darwin-x86.mk index cd0f0a1b2c..6e38f14ed0 100644 --- a/android_webview/native/android_webview_native_jni.target.darwin-x86.mk +++ b/android_webview/native/android_webview_native_jni.target.darwin-x86.mk @@ -18,7 +18,7 @@ GYP_TARGET_DEPENDENCIES := \ ### Generated for rule "android_webview_native_webview_native_gyp_android_webview_native_jni_target_generate_jni_headers": -# "{'inputs': ['../../base/android/jni_generator/jni_generator.py', '../../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/android_webview/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['../java/src/org/chromium/android_webview/AndroidProtocolHandler.java', '../java/src/org/chromium/android_webview/AwAutofillClient.java', '../java/src/org/chromium/android_webview/AwContents.java', '../java/src/org/chromium/android_webview/AwContentsClientBridge.java', '../java/src/org/chromium/android_webview/AwContentsIoThreadClient.java', '../java/src/org/chromium/android_webview/AwContentsStatics.java', '../java/src/org/chromium/android_webview/AwCookieManager.java', '../java/src/org/chromium/android_webview/AwDevToolsServer.java', '../java/src/org/chromium/android_webview/AwFormDatabase.java', '../java/src/org/chromium/android_webview/AwHttpAuthHandler.java', '../java/src/org/chromium/android_webview/AwPdfExporter.java', '../java/src/org/chromium/android_webview/AwPicture.java', '../java/src/org/chromium/android_webview/AwQuotaManagerBridge.java', '../java/src/org/chromium/android_webview/AwResource.java', '../java/src/org/chromium/android_webview/AwSettings.java', '../java/src/org/chromium/android_webview/AwWebContentsDelegate.java', '../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java', '../java/src/org/chromium/android_webview/InterceptedRequestData.java', '../java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java', '../java/src/org/chromium/android_webview/permission/AwPermissionRequest.java'], 'action': ['../../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/android_webview/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": +# "{'inputs': ['../../base/android/jni_generator/jni_generator.py', '../../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/android_webview/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['../java/src/org/chromium/android_webview/AndroidProtocolHandler.java', '../java/src/org/chromium/android_webview/AwAutofillClient.java', '../java/src/org/chromium/android_webview/AwContents.java', '../java/src/org/chromium/android_webview/AwContentsClientBridge.java', '../java/src/org/chromium/android_webview/AwContentsIoThreadClient.java', '../java/src/org/chromium/android_webview/AwContentsStatics.java', '../java/src/org/chromium/android_webview/AwCookieManager.java', '../java/src/org/chromium/android_webview/AwDevToolsServer.java', '../java/src/org/chromium/android_webview/AwFormDatabase.java', '../java/src/org/chromium/android_webview/AwHttpAuthHandler.java', '../java/src/org/chromium/android_webview/AwPdfExporter.java', '../java/src/org/chromium/android_webview/AwPicture.java', '../java/src/org/chromium/android_webview/AwQuotaManagerBridge.java', '../java/src/org/chromium/android_webview/AwResource.java', '../java/src/org/chromium/android_webview/AwSettings.java', '../java/src/org/chromium/android_webview/AwWebContentsDelegate.java', '../java/src/org/chromium/android_webview/AwWebResourceResponse.java', '../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java', '../java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java', '../java/src/org/chromium/android_webview/permission/AwPermissionRequest.java'], 'action': ['../../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/android_webview/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -163,6 +163,15 @@ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h: mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/AwWebContentsDelegate.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: $(LOCAL_PATH)/android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java $(LOCAL_PATH)/base/android/jni_generator/jni_generator.py $(LOCAL_PATH)/android_webview/build/jarjar-rules.txt $(GYP_TARGET_DEPENDENCIES) + mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/AwWebResourceResponse.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long + + $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -172,15 +181,6 @@ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_local_path := $(LOCAL_PATH) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: $(LOCAL_PATH)/android_webview/java/src/org/chromium/android_webview/InterceptedRequestData.java $(LOCAL_PATH)/base/android/jni_generator/jni_generator.py $(LOCAL_PATH)/android_webview/build/jarjar-rules.txt $(GYP_TARGET_DEPENDENCIES) - mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/InterceptedRequestData.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long - - $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -217,8 +217,8 @@ GYP_GENERATED_OUTPUTS := \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwResource_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwSettings_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h \ + $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h \ - $(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwPermissionRequest_jni.h @@ -242,8 +242,8 @@ LOCAL_GENERATED_SOURCES := \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwResource_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwSettings_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h \ + $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h \ - $(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwPermissionRequest_jni.h @@ -310,6 +310,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -401,6 +402,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/android_webview_native_jni.target.darwin-x86_64.mk b/android_webview/native/android_webview_native_jni.target.darwin-x86_64.mk index 4a6d67fc5d..ee675d9877 100644 --- a/android_webview/native/android_webview_native_jni.target.darwin-x86_64.mk +++ b/android_webview/native/android_webview_native_jni.target.darwin-x86_64.mk @@ -18,7 +18,7 @@ GYP_TARGET_DEPENDENCIES := \ ### Generated for rule "android_webview_native_webview_native_gyp_android_webview_native_jni_target_generate_jni_headers": -# "{'inputs': ['../../base/android/jni_generator/jni_generator.py', '../../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/android_webview/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['../java/src/org/chromium/android_webview/AndroidProtocolHandler.java', '../java/src/org/chromium/android_webview/AwAutofillClient.java', '../java/src/org/chromium/android_webview/AwContents.java', '../java/src/org/chromium/android_webview/AwContentsClientBridge.java', '../java/src/org/chromium/android_webview/AwContentsIoThreadClient.java', '../java/src/org/chromium/android_webview/AwContentsStatics.java', '../java/src/org/chromium/android_webview/AwCookieManager.java', '../java/src/org/chromium/android_webview/AwDevToolsServer.java', '../java/src/org/chromium/android_webview/AwFormDatabase.java', '../java/src/org/chromium/android_webview/AwHttpAuthHandler.java', '../java/src/org/chromium/android_webview/AwPdfExporter.java', '../java/src/org/chromium/android_webview/AwPicture.java', '../java/src/org/chromium/android_webview/AwQuotaManagerBridge.java', '../java/src/org/chromium/android_webview/AwResource.java', '../java/src/org/chromium/android_webview/AwSettings.java', '../java/src/org/chromium/android_webview/AwWebContentsDelegate.java', '../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java', '../java/src/org/chromium/android_webview/InterceptedRequestData.java', '../java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java', '../java/src/org/chromium/android_webview/permission/AwPermissionRequest.java'], 'action': ['../../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/android_webview/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": +# "{'inputs': ['../../base/android/jni_generator/jni_generator.py', '../../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/android_webview/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['../java/src/org/chromium/android_webview/AndroidProtocolHandler.java', '../java/src/org/chromium/android_webview/AwAutofillClient.java', '../java/src/org/chromium/android_webview/AwContents.java', '../java/src/org/chromium/android_webview/AwContentsClientBridge.java', '../java/src/org/chromium/android_webview/AwContentsIoThreadClient.java', '../java/src/org/chromium/android_webview/AwContentsStatics.java', '../java/src/org/chromium/android_webview/AwCookieManager.java', '../java/src/org/chromium/android_webview/AwDevToolsServer.java', '../java/src/org/chromium/android_webview/AwFormDatabase.java', '../java/src/org/chromium/android_webview/AwHttpAuthHandler.java', '../java/src/org/chromium/android_webview/AwPdfExporter.java', '../java/src/org/chromium/android_webview/AwPicture.java', '../java/src/org/chromium/android_webview/AwQuotaManagerBridge.java', '../java/src/org/chromium/android_webview/AwResource.java', '../java/src/org/chromium/android_webview/AwSettings.java', '../java/src/org/chromium/android_webview/AwWebContentsDelegate.java', '../java/src/org/chromium/android_webview/AwWebResourceResponse.java', '../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java', '../java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java', '../java/src/org/chromium/android_webview/permission/AwPermissionRequest.java'], 'action': ['../../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/android_webview/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -163,6 +163,15 @@ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h: mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/AwWebContentsDelegate.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: $(LOCAL_PATH)/android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java $(LOCAL_PATH)/base/android/jni_generator/jni_generator.py $(LOCAL_PATH)/android_webview/build/jarjar-rules.txt $(GYP_TARGET_DEPENDENCIES) + mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/AwWebResourceResponse.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long + + $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -172,15 +181,6 @@ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_local_path := $(LOCAL_PATH) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: $(LOCAL_PATH)/android_webview/java/src/org/chromium/android_webview/InterceptedRequestData.java $(LOCAL_PATH)/base/android/jni_generator/jni_generator.py $(LOCAL_PATH)/android_webview/build/jarjar-rules.txt $(GYP_TARGET_DEPENDENCIES) - mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/InterceptedRequestData.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long - - $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -217,8 +217,8 @@ GYP_GENERATED_OUTPUTS := \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwResource_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwSettings_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h \ + $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h \ - $(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwPermissionRequest_jni.h @@ -242,8 +242,8 @@ LOCAL_GENERATED_SOURCES := \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwResource_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwSettings_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h \ + $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h \ - $(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwPermissionRequest_jni.h @@ -309,6 +309,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -399,6 +400,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/android_webview_native_jni.target.linux-arm.mk b/android_webview/native/android_webview_native_jni.target.linux-arm.mk index afb8b32b82..047287b094 100644 --- a/android_webview/native/android_webview_native_jni.target.linux-arm.mk +++ b/android_webview/native/android_webview_native_jni.target.linux-arm.mk @@ -18,7 +18,7 @@ GYP_TARGET_DEPENDENCIES := \ ### Generated for rule "android_webview_native_webview_native_gyp_android_webview_native_jni_target_generate_jni_headers": -# "{'inputs': ['../../base/android/jni_generator/jni_generator.py', '../../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/android_webview/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['../java/src/org/chromium/android_webview/AndroidProtocolHandler.java', '../java/src/org/chromium/android_webview/AwAutofillClient.java', '../java/src/org/chromium/android_webview/AwContents.java', '../java/src/org/chromium/android_webview/AwContentsClientBridge.java', '../java/src/org/chromium/android_webview/AwContentsIoThreadClient.java', '../java/src/org/chromium/android_webview/AwContentsStatics.java', '../java/src/org/chromium/android_webview/AwCookieManager.java', '../java/src/org/chromium/android_webview/AwDevToolsServer.java', '../java/src/org/chromium/android_webview/AwFormDatabase.java', '../java/src/org/chromium/android_webview/AwHttpAuthHandler.java', '../java/src/org/chromium/android_webview/AwPdfExporter.java', '../java/src/org/chromium/android_webview/AwPicture.java', '../java/src/org/chromium/android_webview/AwQuotaManagerBridge.java', '../java/src/org/chromium/android_webview/AwResource.java', '../java/src/org/chromium/android_webview/AwSettings.java', '../java/src/org/chromium/android_webview/AwWebContentsDelegate.java', '../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java', '../java/src/org/chromium/android_webview/InterceptedRequestData.java', '../java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java', '../java/src/org/chromium/android_webview/permission/AwPermissionRequest.java'], 'action': ['../../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/android_webview/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": +# "{'inputs': ['../../base/android/jni_generator/jni_generator.py', '../../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/android_webview/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['../java/src/org/chromium/android_webview/AndroidProtocolHandler.java', '../java/src/org/chromium/android_webview/AwAutofillClient.java', '../java/src/org/chromium/android_webview/AwContents.java', '../java/src/org/chromium/android_webview/AwContentsClientBridge.java', '../java/src/org/chromium/android_webview/AwContentsIoThreadClient.java', '../java/src/org/chromium/android_webview/AwContentsStatics.java', '../java/src/org/chromium/android_webview/AwCookieManager.java', '../java/src/org/chromium/android_webview/AwDevToolsServer.java', '../java/src/org/chromium/android_webview/AwFormDatabase.java', '../java/src/org/chromium/android_webview/AwHttpAuthHandler.java', '../java/src/org/chromium/android_webview/AwPdfExporter.java', '../java/src/org/chromium/android_webview/AwPicture.java', '../java/src/org/chromium/android_webview/AwQuotaManagerBridge.java', '../java/src/org/chromium/android_webview/AwResource.java', '../java/src/org/chromium/android_webview/AwSettings.java', '../java/src/org/chromium/android_webview/AwWebContentsDelegate.java', '../java/src/org/chromium/android_webview/AwWebResourceResponse.java', '../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java', '../java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java', '../java/src/org/chromium/android_webview/permission/AwPermissionRequest.java'], 'action': ['../../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/android_webview/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -163,6 +163,15 @@ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h: mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/AwWebContentsDelegate.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: $(LOCAL_PATH)/android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java $(LOCAL_PATH)/base/android/jni_generator/jni_generator.py $(LOCAL_PATH)/android_webview/build/jarjar-rules.txt $(GYP_TARGET_DEPENDENCIES) + mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/AwWebResourceResponse.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long + + $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -172,15 +181,6 @@ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_local_path := $(LOCAL_PATH) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: $(LOCAL_PATH)/android_webview/java/src/org/chromium/android_webview/InterceptedRequestData.java $(LOCAL_PATH)/base/android/jni_generator/jni_generator.py $(LOCAL_PATH)/android_webview/build/jarjar-rules.txt $(GYP_TARGET_DEPENDENCIES) - mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/InterceptedRequestData.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long - - $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -217,8 +217,8 @@ GYP_GENERATED_OUTPUTS := \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwResource_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwSettings_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h \ + $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h \ - $(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwPermissionRequest_jni.h @@ -242,8 +242,8 @@ LOCAL_GENERATED_SOURCES := \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwResource_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwSettings_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h \ + $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h \ - $(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwPermissionRequest_jni.h @@ -315,6 +315,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -412,6 +413,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/android_webview_native_jni.target.linux-arm64.mk b/android_webview/native/android_webview_native_jni.target.linux-arm64.mk index 019c36715b..a239b07037 100644 --- a/android_webview/native/android_webview_native_jni.target.linux-arm64.mk +++ b/android_webview/native/android_webview_native_jni.target.linux-arm64.mk @@ -18,7 +18,7 @@ GYP_TARGET_DEPENDENCIES := \ ### Generated for rule "android_webview_native_webview_native_gyp_android_webview_native_jni_target_generate_jni_headers": -# "{'inputs': ['../../base/android/jni_generator/jni_generator.py', '../../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/android_webview/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['../java/src/org/chromium/android_webview/AndroidProtocolHandler.java', '../java/src/org/chromium/android_webview/AwAutofillClient.java', '../java/src/org/chromium/android_webview/AwContents.java', '../java/src/org/chromium/android_webview/AwContentsClientBridge.java', '../java/src/org/chromium/android_webview/AwContentsIoThreadClient.java', '../java/src/org/chromium/android_webview/AwContentsStatics.java', '../java/src/org/chromium/android_webview/AwCookieManager.java', '../java/src/org/chromium/android_webview/AwDevToolsServer.java', '../java/src/org/chromium/android_webview/AwFormDatabase.java', '../java/src/org/chromium/android_webview/AwHttpAuthHandler.java', '../java/src/org/chromium/android_webview/AwPdfExporter.java', '../java/src/org/chromium/android_webview/AwPicture.java', '../java/src/org/chromium/android_webview/AwQuotaManagerBridge.java', '../java/src/org/chromium/android_webview/AwResource.java', '../java/src/org/chromium/android_webview/AwSettings.java', '../java/src/org/chromium/android_webview/AwWebContentsDelegate.java', '../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java', '../java/src/org/chromium/android_webview/InterceptedRequestData.java', '../java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java', '../java/src/org/chromium/android_webview/permission/AwPermissionRequest.java'], 'action': ['../../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/android_webview/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": +# "{'inputs': ['../../base/android/jni_generator/jni_generator.py', '../../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/android_webview/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['../java/src/org/chromium/android_webview/AndroidProtocolHandler.java', '../java/src/org/chromium/android_webview/AwAutofillClient.java', '../java/src/org/chromium/android_webview/AwContents.java', '../java/src/org/chromium/android_webview/AwContentsClientBridge.java', '../java/src/org/chromium/android_webview/AwContentsIoThreadClient.java', '../java/src/org/chromium/android_webview/AwContentsStatics.java', '../java/src/org/chromium/android_webview/AwCookieManager.java', '../java/src/org/chromium/android_webview/AwDevToolsServer.java', '../java/src/org/chromium/android_webview/AwFormDatabase.java', '../java/src/org/chromium/android_webview/AwHttpAuthHandler.java', '../java/src/org/chromium/android_webview/AwPdfExporter.java', '../java/src/org/chromium/android_webview/AwPicture.java', '../java/src/org/chromium/android_webview/AwQuotaManagerBridge.java', '../java/src/org/chromium/android_webview/AwResource.java', '../java/src/org/chromium/android_webview/AwSettings.java', '../java/src/org/chromium/android_webview/AwWebContentsDelegate.java', '../java/src/org/chromium/android_webview/AwWebResourceResponse.java', '../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java', '../java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java', '../java/src/org/chromium/android_webview/permission/AwPermissionRequest.java'], 'action': ['../../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/android_webview/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -163,6 +163,15 @@ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h: mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/AwWebContentsDelegate.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: $(LOCAL_PATH)/android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java $(LOCAL_PATH)/base/android/jni_generator/jni_generator.py $(LOCAL_PATH)/android_webview/build/jarjar-rules.txt $(GYP_TARGET_DEPENDENCIES) + mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/AwWebResourceResponse.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long + + $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -172,15 +181,6 @@ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_local_path := $(LOCAL_PATH) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: $(LOCAL_PATH)/android_webview/java/src/org/chromium/android_webview/InterceptedRequestData.java $(LOCAL_PATH)/base/android/jni_generator/jni_generator.py $(LOCAL_PATH)/android_webview/build/jarjar-rules.txt $(GYP_TARGET_DEPENDENCIES) - mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/InterceptedRequestData.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long - - $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -217,8 +217,8 @@ GYP_GENERATED_OUTPUTS := \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwResource_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwSettings_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h \ + $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h \ - $(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwPermissionRequest_jni.h @@ -242,8 +242,8 @@ LOCAL_GENERATED_SOURCES := \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwResource_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwSettings_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h \ + $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h \ - $(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwPermissionRequest_jni.h @@ -305,6 +305,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -391,6 +392,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/android_webview_native_jni.target.linux-mips.mk b/android_webview/native/android_webview_native_jni.target.linux-mips.mk index c3bc38a0bb..7317555e94 100644 --- a/android_webview/native/android_webview_native_jni.target.linux-mips.mk +++ b/android_webview/native/android_webview_native_jni.target.linux-mips.mk @@ -18,7 +18,7 @@ GYP_TARGET_DEPENDENCIES := \ ### Generated for rule "android_webview_native_webview_native_gyp_android_webview_native_jni_target_generate_jni_headers": -# "{'inputs': ['../../base/android/jni_generator/jni_generator.py', '../../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/android_webview/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['../java/src/org/chromium/android_webview/AndroidProtocolHandler.java', '../java/src/org/chromium/android_webview/AwAutofillClient.java', '../java/src/org/chromium/android_webview/AwContents.java', '../java/src/org/chromium/android_webview/AwContentsClientBridge.java', '../java/src/org/chromium/android_webview/AwContentsIoThreadClient.java', '../java/src/org/chromium/android_webview/AwContentsStatics.java', '../java/src/org/chromium/android_webview/AwCookieManager.java', '../java/src/org/chromium/android_webview/AwDevToolsServer.java', '../java/src/org/chromium/android_webview/AwFormDatabase.java', '../java/src/org/chromium/android_webview/AwHttpAuthHandler.java', '../java/src/org/chromium/android_webview/AwPdfExporter.java', '../java/src/org/chromium/android_webview/AwPicture.java', '../java/src/org/chromium/android_webview/AwQuotaManagerBridge.java', '../java/src/org/chromium/android_webview/AwResource.java', '../java/src/org/chromium/android_webview/AwSettings.java', '../java/src/org/chromium/android_webview/AwWebContentsDelegate.java', '../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java', '../java/src/org/chromium/android_webview/InterceptedRequestData.java', '../java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java', '../java/src/org/chromium/android_webview/permission/AwPermissionRequest.java'], 'action': ['../../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/android_webview/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": +# "{'inputs': ['../../base/android/jni_generator/jni_generator.py', '../../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/android_webview/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['../java/src/org/chromium/android_webview/AndroidProtocolHandler.java', '../java/src/org/chromium/android_webview/AwAutofillClient.java', '../java/src/org/chromium/android_webview/AwContents.java', '../java/src/org/chromium/android_webview/AwContentsClientBridge.java', '../java/src/org/chromium/android_webview/AwContentsIoThreadClient.java', '../java/src/org/chromium/android_webview/AwContentsStatics.java', '../java/src/org/chromium/android_webview/AwCookieManager.java', '../java/src/org/chromium/android_webview/AwDevToolsServer.java', '../java/src/org/chromium/android_webview/AwFormDatabase.java', '../java/src/org/chromium/android_webview/AwHttpAuthHandler.java', '../java/src/org/chromium/android_webview/AwPdfExporter.java', '../java/src/org/chromium/android_webview/AwPicture.java', '../java/src/org/chromium/android_webview/AwQuotaManagerBridge.java', '../java/src/org/chromium/android_webview/AwResource.java', '../java/src/org/chromium/android_webview/AwSettings.java', '../java/src/org/chromium/android_webview/AwWebContentsDelegate.java', '../java/src/org/chromium/android_webview/AwWebResourceResponse.java', '../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java', '../java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java', '../java/src/org/chromium/android_webview/permission/AwPermissionRequest.java'], 'action': ['../../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/android_webview/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -163,6 +163,15 @@ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h: mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/AwWebContentsDelegate.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: $(LOCAL_PATH)/android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java $(LOCAL_PATH)/base/android/jni_generator/jni_generator.py $(LOCAL_PATH)/android_webview/build/jarjar-rules.txt $(GYP_TARGET_DEPENDENCIES) + mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/AwWebResourceResponse.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long + + $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -172,15 +181,6 @@ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_local_path := $(LOCAL_PATH) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: $(LOCAL_PATH)/android_webview/java/src/org/chromium/android_webview/InterceptedRequestData.java $(LOCAL_PATH)/base/android/jni_generator/jni_generator.py $(LOCAL_PATH)/android_webview/build/jarjar-rules.txt $(GYP_TARGET_DEPENDENCIES) - mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/InterceptedRequestData.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long - - $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -217,8 +217,8 @@ GYP_GENERATED_OUTPUTS := \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwResource_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwSettings_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h \ + $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h \ - $(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwPermissionRequest_jni.h @@ -242,8 +242,8 @@ LOCAL_GENERATED_SOURCES := \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwResource_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwSettings_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h \ + $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h \ - $(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwPermissionRequest_jni.h @@ -309,6 +309,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -400,6 +401,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/android_webview_native_jni.target.linux-x86.mk b/android_webview/native/android_webview_native_jni.target.linux-x86.mk index cd0f0a1b2c..6e38f14ed0 100644 --- a/android_webview/native/android_webview_native_jni.target.linux-x86.mk +++ b/android_webview/native/android_webview_native_jni.target.linux-x86.mk @@ -18,7 +18,7 @@ GYP_TARGET_DEPENDENCIES := \ ### Generated for rule "android_webview_native_webview_native_gyp_android_webview_native_jni_target_generate_jni_headers": -# "{'inputs': ['../../base/android/jni_generator/jni_generator.py', '../../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/android_webview/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['../java/src/org/chromium/android_webview/AndroidProtocolHandler.java', '../java/src/org/chromium/android_webview/AwAutofillClient.java', '../java/src/org/chromium/android_webview/AwContents.java', '../java/src/org/chromium/android_webview/AwContentsClientBridge.java', '../java/src/org/chromium/android_webview/AwContentsIoThreadClient.java', '../java/src/org/chromium/android_webview/AwContentsStatics.java', '../java/src/org/chromium/android_webview/AwCookieManager.java', '../java/src/org/chromium/android_webview/AwDevToolsServer.java', '../java/src/org/chromium/android_webview/AwFormDatabase.java', '../java/src/org/chromium/android_webview/AwHttpAuthHandler.java', '../java/src/org/chromium/android_webview/AwPdfExporter.java', '../java/src/org/chromium/android_webview/AwPicture.java', '../java/src/org/chromium/android_webview/AwQuotaManagerBridge.java', '../java/src/org/chromium/android_webview/AwResource.java', '../java/src/org/chromium/android_webview/AwSettings.java', '../java/src/org/chromium/android_webview/AwWebContentsDelegate.java', '../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java', '../java/src/org/chromium/android_webview/InterceptedRequestData.java', '../java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java', '../java/src/org/chromium/android_webview/permission/AwPermissionRequest.java'], 'action': ['../../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/android_webview/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": +# "{'inputs': ['../../base/android/jni_generator/jni_generator.py', '../../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/android_webview/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['../java/src/org/chromium/android_webview/AndroidProtocolHandler.java', '../java/src/org/chromium/android_webview/AwAutofillClient.java', '../java/src/org/chromium/android_webview/AwContents.java', '../java/src/org/chromium/android_webview/AwContentsClientBridge.java', '../java/src/org/chromium/android_webview/AwContentsIoThreadClient.java', '../java/src/org/chromium/android_webview/AwContentsStatics.java', '../java/src/org/chromium/android_webview/AwCookieManager.java', '../java/src/org/chromium/android_webview/AwDevToolsServer.java', '../java/src/org/chromium/android_webview/AwFormDatabase.java', '../java/src/org/chromium/android_webview/AwHttpAuthHandler.java', '../java/src/org/chromium/android_webview/AwPdfExporter.java', '../java/src/org/chromium/android_webview/AwPicture.java', '../java/src/org/chromium/android_webview/AwQuotaManagerBridge.java', '../java/src/org/chromium/android_webview/AwResource.java', '../java/src/org/chromium/android_webview/AwSettings.java', '../java/src/org/chromium/android_webview/AwWebContentsDelegate.java', '../java/src/org/chromium/android_webview/AwWebResourceResponse.java', '../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java', '../java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java', '../java/src/org/chromium/android_webview/permission/AwPermissionRequest.java'], 'action': ['../../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/android_webview/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -163,6 +163,15 @@ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h: mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/AwWebContentsDelegate.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: $(LOCAL_PATH)/android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java $(LOCAL_PATH)/base/android/jni_generator/jni_generator.py $(LOCAL_PATH)/android_webview/build/jarjar-rules.txt $(GYP_TARGET_DEPENDENCIES) + mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/AwWebResourceResponse.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long + + $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -172,15 +181,6 @@ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_local_path := $(LOCAL_PATH) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: $(LOCAL_PATH)/android_webview/java/src/org/chromium/android_webview/InterceptedRequestData.java $(LOCAL_PATH)/base/android/jni_generator/jni_generator.py $(LOCAL_PATH)/android_webview/build/jarjar-rules.txt $(GYP_TARGET_DEPENDENCIES) - mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/InterceptedRequestData.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long - - $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -217,8 +217,8 @@ GYP_GENERATED_OUTPUTS := \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwResource_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwSettings_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h \ + $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h \ - $(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwPermissionRequest_jni.h @@ -242,8 +242,8 @@ LOCAL_GENERATED_SOURCES := \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwResource_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwSettings_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h \ + $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h \ - $(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwPermissionRequest_jni.h @@ -310,6 +310,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -401,6 +402,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/android_webview_native_jni.target.linux-x86_64.mk b/android_webview/native/android_webview_native_jni.target.linux-x86_64.mk index 4a6d67fc5d..ee675d9877 100644 --- a/android_webview/native/android_webview_native_jni.target.linux-x86_64.mk +++ b/android_webview/native/android_webview_native_jni.target.linux-x86_64.mk @@ -18,7 +18,7 @@ GYP_TARGET_DEPENDENCIES := \ ### Generated for rule "android_webview_native_webview_native_gyp_android_webview_native_jni_target_generate_jni_headers": -# "{'inputs': ['../../base/android/jni_generator/jni_generator.py', '../../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/android_webview/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['../java/src/org/chromium/android_webview/AndroidProtocolHandler.java', '../java/src/org/chromium/android_webview/AwAutofillClient.java', '../java/src/org/chromium/android_webview/AwContents.java', '../java/src/org/chromium/android_webview/AwContentsClientBridge.java', '../java/src/org/chromium/android_webview/AwContentsIoThreadClient.java', '../java/src/org/chromium/android_webview/AwContentsStatics.java', '../java/src/org/chromium/android_webview/AwCookieManager.java', '../java/src/org/chromium/android_webview/AwDevToolsServer.java', '../java/src/org/chromium/android_webview/AwFormDatabase.java', '../java/src/org/chromium/android_webview/AwHttpAuthHandler.java', '../java/src/org/chromium/android_webview/AwPdfExporter.java', '../java/src/org/chromium/android_webview/AwPicture.java', '../java/src/org/chromium/android_webview/AwQuotaManagerBridge.java', '../java/src/org/chromium/android_webview/AwResource.java', '../java/src/org/chromium/android_webview/AwSettings.java', '../java/src/org/chromium/android_webview/AwWebContentsDelegate.java', '../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java', '../java/src/org/chromium/android_webview/InterceptedRequestData.java', '../java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java', '../java/src/org/chromium/android_webview/permission/AwPermissionRequest.java'], 'action': ['../../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/android_webview/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": +# "{'inputs': ['../../base/android/jni_generator/jni_generator.py', '../../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/android_webview/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['../java/src/org/chromium/android_webview/AndroidProtocolHandler.java', '../java/src/org/chromium/android_webview/AwAutofillClient.java', '../java/src/org/chromium/android_webview/AwContents.java', '../java/src/org/chromium/android_webview/AwContentsClientBridge.java', '../java/src/org/chromium/android_webview/AwContentsIoThreadClient.java', '../java/src/org/chromium/android_webview/AwContentsStatics.java', '../java/src/org/chromium/android_webview/AwCookieManager.java', '../java/src/org/chromium/android_webview/AwDevToolsServer.java', '../java/src/org/chromium/android_webview/AwFormDatabase.java', '../java/src/org/chromium/android_webview/AwHttpAuthHandler.java', '../java/src/org/chromium/android_webview/AwPdfExporter.java', '../java/src/org/chromium/android_webview/AwPicture.java', '../java/src/org/chromium/android_webview/AwQuotaManagerBridge.java', '../java/src/org/chromium/android_webview/AwResource.java', '../java/src/org/chromium/android_webview/AwSettings.java', '../java/src/org/chromium/android_webview/AwWebContentsDelegate.java', '../java/src/org/chromium/android_webview/AwWebResourceResponse.java', '../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java', '../java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java', '../java/src/org/chromium/android_webview/permission/AwPermissionRequest.java'], 'action': ['../../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/android_webview/jni', '--includes', 'base/android/jni_generator/jni_generator_helper.h', '--optimize_generation', '0', '--jarjar', '../../android_webview/build/jarjar-rules.txt', '--ptr_type', 'long'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/AndroidProtocolHandler_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -163,6 +163,15 @@ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h: mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/AwWebContentsDelegate.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_local_path := $(LOCAL_PATH) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) +$(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h: $(LOCAL_PATH)/android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java $(LOCAL_PATH)/base/android/jni_generator/jni_generator.py $(LOCAL_PATH)/android_webview/build/jarjar-rules.txt $(GYP_TARGET_DEPENDENCIES) + mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/AwWebResourceResponse.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long + + $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -172,15 +181,6 @@ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_local_path := $(LOCAL_PATH) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) -$(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h: $(LOCAL_PATH)/android_webview/java/src/org/chromium/android_webview/InterceptedRequestData.java $(LOCAL_PATH)/base/android/jni_generator/jni_generator.py $(LOCAL_PATH)/android_webview/build/jarjar-rules.txt $(GYP_TARGET_DEPENDENCIES) - mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; cd $(gyp_local_path)/android_webview/native; ../../base/android/jni_generator/jni_generator.py --input_file ../java/src/org/chromium/android_webview/InterceptedRequestData.java --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 --jarjar ../../android_webview/build/jarjar-rules.txt --ptr_type long - - $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_var_prefix := $(GYP_VAR_PREFIX) $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) @@ -217,8 +217,8 @@ GYP_GENERATED_OUTPUTS := \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwResource_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwSettings_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h \ + $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h \ - $(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwPermissionRequest_jni.h @@ -242,8 +242,8 @@ LOCAL_GENERATED_SOURCES := \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwResource_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwSettings_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebContentsDelegate_jni.h \ + $(gyp_shared_intermediate_dir)/android_webview/jni/AwWebResourceResponse_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/ExternalVideoSurfaceContainer_jni.h \ - $(gyp_shared_intermediate_dir)/android_webview/jni/InterceptedRequestData_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/JavaBrowserViewRendererHelper_jni.h \ $(gyp_shared_intermediate_dir)/android_webview/jni/AwPermissionRequest_jni.h @@ -309,6 +309,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -399,6 +400,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/aw_contents_io_thread_client_impl.cc b/android_webview/native/aw_contents_io_thread_client_impl.cc index fd47138691..a6912a8f07 100644 --- a/android_webview/native/aw_contents_io_thread_client_impl.cc +++ b/android_webview/native/aw_contents_io_thread_client_impl.cc @@ -8,7 +8,8 @@ #include <utility> #include "android_webview/common/devtools_instrumentation.h" -#include "android_webview/native/intercepted_request_data_impl.h" +#include "android_webview/native/aw_web_resource_response_impl.h" +#include "base/android/jni_array.h" #include "base/android/jni_string.h" #include "base/android/jni_weak_ref.h" #include "base/lazy_instance.h" @@ -23,6 +24,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" #include "jni/AwContentsIoThreadClient_jni.h" +#include "net/http/http_request_headers.h" #include "net/url_request/url_request.h" #include "url/gurl.h" @@ -30,12 +32,15 @@ using base::android::AttachCurrentThread; using base::android::ConvertUTF8ToJavaString; using base::android::JavaRef; using base::android::ScopedJavaLocalRef; +using base::android::ToJavaArrayOfStrings; using base::LazyInstance; using content::BrowserThread; using content::RenderFrameHost; using content::WebContents; using std::map; using std::pair; +using std::string; +using std::vector; namespace android_webview { @@ -227,30 +232,57 @@ AwContentsIoThreadClientImpl::GetCacheMode() const { env, java_object_.obj())); } -scoped_ptr<InterceptedRequestData> +scoped_ptr<AwWebResourceResponse> AwContentsIoThreadClientImpl::ShouldInterceptRequest( const GURL& location, const net::URLRequest* request) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); if (java_object_.is_null()) - return scoped_ptr<InterceptedRequestData>(); + return scoped_ptr<AwWebResourceResponse>(); const content::ResourceRequestInfo* info = content::ResourceRequestInfo::ForRequest(request); bool is_main_frame = info && info->GetResourceType() == ResourceType::MAIN_FRAME; + bool has_user_gesture = info && info->HasUserGesture(); + + vector<string> headers_names; + vector<string> headers_values; + { + net::HttpRequestHeaders headers; + if (!request->GetFullRequestHeaders(&headers)) + headers = request->extra_request_headers(); + net::HttpRequestHeaders::Iterator headers_iterator(headers); + while (headers_iterator.GetNext()) { + headers_names.push_back(headers_iterator.name()); + headers_values.push_back(headers_iterator.value()); + } + } JNIEnv* env = AttachCurrentThread(); ScopedJavaLocalRef<jstring> jstring_url = ConvertUTF8ToJavaString(env, location.spec()); + ScopedJavaLocalRef<jstring> jstring_method = + ConvertUTF8ToJavaString(env, request->method()); + ScopedJavaLocalRef<jobjectArray> jstringArray_headers_names = + ToJavaArrayOfStrings(env, headers_names); + ScopedJavaLocalRef<jobjectArray> jstringArray_headers_values = + ToJavaArrayOfStrings(env, headers_values); devtools_instrumentation::ScopedEmbedderCallbackTask embedder_callback( "shouldInterceptRequest"); ScopedJavaLocalRef<jobject> ret = Java_AwContentsIoThreadClient_shouldInterceptRequest( - env, java_object_.obj(), jstring_url.obj(), is_main_frame); + env, + java_object_.obj(), + jstring_url.obj(), + is_main_frame, + has_user_gesture, + jstring_method.obj(), + jstringArray_headers_names.obj(), + jstringArray_headers_values.obj()); if (ret.is_null()) - return scoped_ptr<InterceptedRequestData>(); - return scoped_ptr<InterceptedRequestData>( - new InterceptedRequestDataImpl(ret)); + return scoped_ptr<AwWebResourceResponse>(); + return scoped_ptr<AwWebResourceResponse>( + new AwWebResourceResponseImpl(ret)); } bool AwContentsIoThreadClientImpl::ShouldBlockContentUrls() const { @@ -295,9 +327,9 @@ bool AwContentsIoThreadClientImpl::ShouldBlockNetworkLoads() const { void AwContentsIoThreadClientImpl::NewDownload( const GURL& url, - const std::string& user_agent, - const std::string& content_disposition, - const std::string& mime_type, + const string& user_agent, + const string& content_disposition, + const string& mime_type, int64 content_length) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); if (java_object_.is_null()) @@ -323,9 +355,9 @@ void AwContentsIoThreadClientImpl::NewDownload( content_length); } -void AwContentsIoThreadClientImpl::NewLoginRequest(const std::string& realm, - const std::string& account, - const std::string& args) { +void AwContentsIoThreadClientImpl::NewLoginRequest(const string& realm, + const string& account, + const string& args) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); if (java_object_.is_null()) return; diff --git a/android_webview/native/aw_contents_io_thread_client_impl.h b/android_webview/native/aw_contents_io_thread_client_impl.h index c783b2b133..27ce4e51b3 100644 --- a/android_webview/native/aw_contents_io_thread_client_impl.h +++ b/android_webview/native/aw_contents_io_thread_client_impl.h @@ -15,6 +15,7 @@ class GURL; namespace content { +class ResourceRequestInfo; class WebContents; } @@ -24,7 +25,7 @@ class URLRequest; namespace android_webview { -class InterceptedRequestData; +class AwWebResourceResponse; class AwContentsIoThreadClientImpl : public AwContentsIoThreadClient { public: @@ -46,7 +47,7 @@ class AwContentsIoThreadClientImpl : public AwContentsIoThreadClient { // Implementation of AwContentsIoThreadClient. virtual bool PendingAssociation() const OVERRIDE; virtual CacheMode GetCacheMode() const OVERRIDE; - virtual scoped_ptr<InterceptedRequestData> ShouldInterceptRequest( + virtual scoped_ptr<AwWebResourceResponse> ShouldInterceptRequest( const GURL& location, const net::URLRequest* request) OVERRIDE; virtual bool ShouldBlockContentUrls() const OVERRIDE; diff --git a/android_webview/native/aw_web_resource_response_impl.cc b/android_webview/native/aw_web_resource_response_impl.cc new file mode 100644 index 0000000000..caaac83de8 --- /dev/null +++ b/android_webview/native/aw_web_resource_response_impl.cc @@ -0,0 +1,104 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "android_webview/native/aw_web_resource_response_impl.h" + +#include "android_webview/native/input_stream_impl.h" +#include "base/android/jni_android.h" +#include "base/android/jni_array.h" +#include "base/android/jni_string.h" +#include "jni/AwWebResourceResponse_jni.h" +#include "net/http/http_response_headers.h" +#include "net/url_request/url_request.h" +#include "net/url_request/url_request_job.h" + +using base::android::ScopedJavaLocalRef; +using base::android::AppendJavaStringArrayToStringVector; + +namespace android_webview { + +AwWebResourceResponseImpl::AwWebResourceResponseImpl( + const base::android::JavaRef<jobject>& obj) + : java_object_(obj) { +} + +AwWebResourceResponseImpl::~AwWebResourceResponseImpl() { +} + +scoped_ptr<InputStream> +AwWebResourceResponseImpl::GetInputStream(JNIEnv* env) const { + ScopedJavaLocalRef<jobject> jstream = + Java_AwWebResourceResponse_getData(env, java_object_.obj()); + if (jstream.is_null()) + return scoped_ptr<InputStream>(); + return make_scoped_ptr<InputStream>(new InputStreamImpl(jstream)); +} + +bool AwWebResourceResponseImpl::GetMimeType(JNIEnv* env, + std::string* mime_type) const { + ScopedJavaLocalRef<jstring> jstring_mime_type = + Java_AwWebResourceResponse_getMimeType(env, java_object_.obj()); + if (jstring_mime_type.is_null()) + return false; + *mime_type = ConvertJavaStringToUTF8(jstring_mime_type); + return true; +} + +bool AwWebResourceResponseImpl::GetCharset( + JNIEnv* env, std::string* charset) const { + ScopedJavaLocalRef<jstring> jstring_charset = + Java_AwWebResourceResponse_getCharset(env, java_object_.obj()); + if (jstring_charset.is_null()) + return false; + *charset = ConvertJavaStringToUTF8(jstring_charset); + return true; +} + +bool AwWebResourceResponseImpl::GetStatusInfo( + JNIEnv* env, + int* status_code, + std::string* reason_phrase) const { + int status = + Java_AwWebResourceResponse_getStatusCode(env, java_object_.obj()); + ScopedJavaLocalRef<jstring> jstring_reason_phrase = + Java_AwWebResourceResponse_getReasonPhrase(env, java_object_.obj()); + if (status < 100 || status >= 600 || jstring_reason_phrase.is_null()) + return false; + *status_code = status; + *reason_phrase = ConvertJavaStringToUTF8(jstring_reason_phrase); + return true; +} + +bool AwWebResourceResponseImpl::GetResponseHeaders( + JNIEnv* env, + net::HttpResponseHeaders* headers) const { + ScopedJavaLocalRef<jobjectArray> jstringArray_headerNames = + Java_AwWebResourceResponse_getResponseHeaderNames(env, + java_object_.obj()); + ScopedJavaLocalRef<jobjectArray> jstringArray_headerValues = + Java_AwWebResourceResponse_getResponseHeaderValues(env, + java_object_.obj()); + if (jstringArray_headerNames.is_null() || jstringArray_headerValues.is_null()) + return false; + std::vector<std::string> header_names; + std::vector<std::string> header_values; + AppendJavaStringArrayToStringVector( + env, jstringArray_headerNames.obj(), &header_names); + AppendJavaStringArrayToStringVector( + env, jstringArray_headerValues.obj(), &header_values); + DCHECK(header_names.size() == header_values.size()); + for(size_t i = 0; i < header_names.size(); ++i) { + std::string header_line(header_names[i]); + header_line.append(": "); + header_line.append(header_values[i]); + headers->AddHeader(header_line); + } + return true; +} + +bool RegisterAwWebResourceResponse(JNIEnv* env) { + return RegisterNativesImpl(env); +} + +} // namespace android_webview diff --git a/android_webview/native/intercepted_request_data_impl.h b/android_webview/native/aw_web_resource_response_impl.h index 598b319321..2cef1c0e89 100644 --- a/android_webview/native/intercepted_request_data_impl.h +++ b/android_webview/native/aw_web_resource_response_impl.h @@ -1,37 +1,47 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #ifndef ANDROID_WEBVIEW_NATIVE_INTERCEPTED_REQUEST_DATA_IMPL_H_ #define ANDROID_WEBVIEW_NATIVE_INTERCEPTED_REQUEST_DATA_IMPL_H_ -#include "android_webview/browser/intercepted_request_data.h" +#include "android_webview/browser/aw_web_resource_response.h" #include "base/android/scoped_java_ref.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" +namespace net { +class HttpResponseHeaders; +} + namespace android_webview { class InputStream; -class InterceptedRequestDataImpl : public InterceptedRequestData { +class AwWebResourceResponseImpl : public AwWebResourceResponse { public: // It is expected that |obj| is an instance of the Java-side - // org.chromium.android_webview.InterceptedRequestData class. - InterceptedRequestDataImpl(const base::android::JavaRef<jobject>& obj); - virtual ~InterceptedRequestDataImpl(); + // org.chromium.android_webview.AwWebResourceResponse class. + AwWebResourceResponseImpl(const base::android::JavaRef<jobject>& obj); + virtual ~AwWebResourceResponseImpl(); virtual scoped_ptr<InputStream> GetInputStream(JNIEnv* env) const OVERRIDE; virtual bool GetMimeType(JNIEnv* env, std::string* mime_type) const OVERRIDE; virtual bool GetCharset(JNIEnv* env, std::string* charset) const OVERRIDE; + virtual bool GetStatusInfo(JNIEnv* env, + int* status_code, + std::string* reason_phrase) const OVERRIDE; + virtual bool GetResponseHeaders( + JNIEnv* env, + net::HttpResponseHeaders* headers) const OVERRIDE; private: base::android::ScopedJavaGlobalRef<jobject> java_object_; - DISALLOW_COPY_AND_ASSIGN(InterceptedRequestDataImpl); + DISALLOW_COPY_AND_ASSIGN(AwWebResourceResponseImpl); }; -bool RegisterInterceptedRequestData(JNIEnv* env); +bool RegisterAwWebResourceResponse(JNIEnv* env); } // namespace android_webview diff --git a/android_webview/native/cancellation_signal_android_jar_jni_headers.target.darwin-arm.mk b/android_webview/native/cancellation_signal_android_jar_jni_headers.target.darwin-arm.mk index a7891b6e74..f623123a21 100644 --- a/android_webview/native/cancellation_signal_android_jar_jni_headers.target.darwin-arm.mk +++ b/android_webview/native/cancellation_signal_android_jar_jni_headers.target.darwin-arm.mk @@ -103,6 +103,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -200,6 +201,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/cancellation_signal_android_jar_jni_headers.target.darwin-arm64.mk b/android_webview/native/cancellation_signal_android_jar_jni_headers.target.darwin-arm64.mk index fc83fa5bc4..4b3a5630d7 100644 --- a/android_webview/native/cancellation_signal_android_jar_jni_headers.target.darwin-arm64.mk +++ b/android_webview/native/cancellation_signal_android_jar_jni_headers.target.darwin-arm64.mk @@ -93,6 +93,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -179,6 +180,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/cancellation_signal_android_jar_jni_headers.target.darwin-mips.mk b/android_webview/native/cancellation_signal_android_jar_jni_headers.target.darwin-mips.mk index 398901ba56..b6ec0f7c23 100644 --- a/android_webview/native/cancellation_signal_android_jar_jni_headers.target.darwin-mips.mk +++ b/android_webview/native/cancellation_signal_android_jar_jni_headers.target.darwin-mips.mk @@ -97,6 +97,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -188,6 +189,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/cancellation_signal_android_jar_jni_headers.target.darwin-x86.mk b/android_webview/native/cancellation_signal_android_jar_jni_headers.target.darwin-x86.mk index 2f5cb5bcc4..a0c3358536 100644 --- a/android_webview/native/cancellation_signal_android_jar_jni_headers.target.darwin-x86.mk +++ b/android_webview/native/cancellation_signal_android_jar_jni_headers.target.darwin-x86.mk @@ -98,6 +98,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -189,6 +190,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/cancellation_signal_android_jar_jni_headers.target.darwin-x86_64.mk b/android_webview/native/cancellation_signal_android_jar_jni_headers.target.darwin-x86_64.mk index b2086ece26..6eaaf12105 100644 --- a/android_webview/native/cancellation_signal_android_jar_jni_headers.target.darwin-x86_64.mk +++ b/android_webview/native/cancellation_signal_android_jar_jni_headers.target.darwin-x86_64.mk @@ -97,6 +97,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -187,6 +188,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/cancellation_signal_android_jar_jni_headers.target.linux-arm.mk b/android_webview/native/cancellation_signal_android_jar_jni_headers.target.linux-arm.mk index a7891b6e74..f623123a21 100644 --- a/android_webview/native/cancellation_signal_android_jar_jni_headers.target.linux-arm.mk +++ b/android_webview/native/cancellation_signal_android_jar_jni_headers.target.linux-arm.mk @@ -103,6 +103,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -200,6 +201,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/cancellation_signal_android_jar_jni_headers.target.linux-arm64.mk b/android_webview/native/cancellation_signal_android_jar_jni_headers.target.linux-arm64.mk index fc83fa5bc4..4b3a5630d7 100644 --- a/android_webview/native/cancellation_signal_android_jar_jni_headers.target.linux-arm64.mk +++ b/android_webview/native/cancellation_signal_android_jar_jni_headers.target.linux-arm64.mk @@ -93,6 +93,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -179,6 +180,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/cancellation_signal_android_jar_jni_headers.target.linux-mips.mk b/android_webview/native/cancellation_signal_android_jar_jni_headers.target.linux-mips.mk index 398901ba56..b6ec0f7c23 100644 --- a/android_webview/native/cancellation_signal_android_jar_jni_headers.target.linux-mips.mk +++ b/android_webview/native/cancellation_signal_android_jar_jni_headers.target.linux-mips.mk @@ -97,6 +97,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -188,6 +189,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/cancellation_signal_android_jar_jni_headers.target.linux-x86.mk b/android_webview/native/cancellation_signal_android_jar_jni_headers.target.linux-x86.mk index 2f5cb5bcc4..a0c3358536 100644 --- a/android_webview/native/cancellation_signal_android_jar_jni_headers.target.linux-x86.mk +++ b/android_webview/native/cancellation_signal_android_jar_jni_headers.target.linux-x86.mk @@ -98,6 +98,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -189,6 +190,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/cancellation_signal_android_jar_jni_headers.target.linux-x86_64.mk b/android_webview/native/cancellation_signal_android_jar_jni_headers.target.linux-x86_64.mk index b2086ece26..6eaaf12105 100644 --- a/android_webview/native/cancellation_signal_android_jar_jni_headers.target.linux-x86_64.mk +++ b/android_webview/native/cancellation_signal_android_jar_jni_headers.target.linux-x86_64.mk @@ -97,6 +97,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -187,6 +188,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/input_stream_android_jar_jni_headers.target.darwin-arm.mk b/android_webview/native/input_stream_android_jar_jni_headers.target.darwin-arm.mk index 94422e0d87..cfccb03780 100644 --- a/android_webview/native/input_stream_android_jar_jni_headers.target.darwin-arm.mk +++ b/android_webview/native/input_stream_android_jar_jni_headers.target.darwin-arm.mk @@ -103,6 +103,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -200,6 +201,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/input_stream_android_jar_jni_headers.target.darwin-arm64.mk b/android_webview/native/input_stream_android_jar_jni_headers.target.darwin-arm64.mk index 544382affc..6afa04d73f 100644 --- a/android_webview/native/input_stream_android_jar_jni_headers.target.darwin-arm64.mk +++ b/android_webview/native/input_stream_android_jar_jni_headers.target.darwin-arm64.mk @@ -93,6 +93,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -179,6 +180,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/input_stream_android_jar_jni_headers.target.darwin-mips.mk b/android_webview/native/input_stream_android_jar_jni_headers.target.darwin-mips.mk index ba634f485e..87cd39ecdb 100644 --- a/android_webview/native/input_stream_android_jar_jni_headers.target.darwin-mips.mk +++ b/android_webview/native/input_stream_android_jar_jni_headers.target.darwin-mips.mk @@ -97,6 +97,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -188,6 +189,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/input_stream_android_jar_jni_headers.target.darwin-x86.mk b/android_webview/native/input_stream_android_jar_jni_headers.target.darwin-x86.mk index 62c01234b0..69ed654297 100644 --- a/android_webview/native/input_stream_android_jar_jni_headers.target.darwin-x86.mk +++ b/android_webview/native/input_stream_android_jar_jni_headers.target.darwin-x86.mk @@ -98,6 +98,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -189,6 +190,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/input_stream_android_jar_jni_headers.target.darwin-x86_64.mk b/android_webview/native/input_stream_android_jar_jni_headers.target.darwin-x86_64.mk index 93190568a7..631eabe3e2 100644 --- a/android_webview/native/input_stream_android_jar_jni_headers.target.darwin-x86_64.mk +++ b/android_webview/native/input_stream_android_jar_jni_headers.target.darwin-x86_64.mk @@ -97,6 +97,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -187,6 +188,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/input_stream_android_jar_jni_headers.target.linux-arm.mk b/android_webview/native/input_stream_android_jar_jni_headers.target.linux-arm.mk index 94422e0d87..cfccb03780 100644 --- a/android_webview/native/input_stream_android_jar_jni_headers.target.linux-arm.mk +++ b/android_webview/native/input_stream_android_jar_jni_headers.target.linux-arm.mk @@ -103,6 +103,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -200,6 +201,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/input_stream_android_jar_jni_headers.target.linux-arm64.mk b/android_webview/native/input_stream_android_jar_jni_headers.target.linux-arm64.mk index 544382affc..6afa04d73f 100644 --- a/android_webview/native/input_stream_android_jar_jni_headers.target.linux-arm64.mk +++ b/android_webview/native/input_stream_android_jar_jni_headers.target.linux-arm64.mk @@ -93,6 +93,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -179,6 +180,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/input_stream_android_jar_jni_headers.target.linux-mips.mk b/android_webview/native/input_stream_android_jar_jni_headers.target.linux-mips.mk index ba634f485e..87cd39ecdb 100644 --- a/android_webview/native/input_stream_android_jar_jni_headers.target.linux-mips.mk +++ b/android_webview/native/input_stream_android_jar_jni_headers.target.linux-mips.mk @@ -97,6 +97,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -188,6 +189,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/input_stream_android_jar_jni_headers.target.linux-x86.mk b/android_webview/native/input_stream_android_jar_jni_headers.target.linux-x86.mk index 62c01234b0..69ed654297 100644 --- a/android_webview/native/input_stream_android_jar_jni_headers.target.linux-x86.mk +++ b/android_webview/native/input_stream_android_jar_jni_headers.target.linux-x86.mk @@ -98,6 +98,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -189,6 +190,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/input_stream_android_jar_jni_headers.target.linux-x86_64.mk b/android_webview/native/input_stream_android_jar_jni_headers.target.linux-x86_64.mk index 93190568a7..631eabe3e2 100644 --- a/android_webview/native/input_stream_android_jar_jni_headers.target.linux-x86_64.mk +++ b/android_webview/native/input_stream_android_jar_jni_headers.target.linux-x86_64.mk @@ -97,6 +97,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -187,6 +188,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/android_webview/native/intercepted_request_data_impl.cc b/android_webview/native/intercepted_request_data_impl.cc deleted file mode 100644 index 8b583dfd58..0000000000 --- a/android_webview/native/intercepted_request_data_impl.cc +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "android_webview/native/intercepted_request_data_impl.h" - -#include "android_webview/native/input_stream_impl.h" -#include "base/android/jni_android.h" -#include "base/android/jni_string.h" -#include "jni/InterceptedRequestData_jni.h" -#include "net/url_request/url_request.h" -#include "net/url_request/url_request_job.h" - -using base::android::ScopedJavaLocalRef; - -namespace android_webview { - -InterceptedRequestDataImpl::InterceptedRequestDataImpl( - const base::android::JavaRef<jobject>& obj) - : java_object_(obj) { -} - -InterceptedRequestDataImpl::~InterceptedRequestDataImpl() { -} - -scoped_ptr<InputStream> -InterceptedRequestDataImpl::GetInputStream(JNIEnv* env) const { - ScopedJavaLocalRef<jobject> jstream = - Java_InterceptedRequestData_getData(env, java_object_.obj()); - if (jstream.is_null()) - return scoped_ptr<InputStream>(); - return make_scoped_ptr<InputStream>(new InputStreamImpl(jstream)); -} - -bool InterceptedRequestDataImpl::GetMimeType(JNIEnv* env, - std::string* mime_type) const { - ScopedJavaLocalRef<jstring> jstring_mime_type = - Java_InterceptedRequestData_getMimeType(env, java_object_.obj()); - if (jstring_mime_type.is_null()) - return false; - *mime_type = ConvertJavaStringToUTF8(jstring_mime_type); - return true; -} - -bool InterceptedRequestDataImpl::GetCharset( - JNIEnv* env, std::string* charset) const { - ScopedJavaLocalRef<jstring> jstring_charset = - Java_InterceptedRequestData_getCharset(env, java_object_.obj()); - if (jstring_charset.is_null()) - return false; - *charset = ConvertJavaStringToUTF8(jstring_charset); - return true; -} - -bool RegisterInterceptedRequestData(JNIEnv* env) { - return RegisterNativesImpl(env); -} - -} // namespace android_webview diff --git a/android_webview/native/webview_native.gyp b/android_webview/native/webview_native.gyp index 48a2a40669..3a332ec6b9 100644 --- a/android_webview/native/webview_native.gyp +++ b/android_webview/native/webview_native.gyp @@ -70,12 +70,12 @@ 'aw_web_contents_view_delegate.h', 'aw_web_preferences_populater_impl.cc', 'aw_web_preferences_populater_impl.h', + 'aw_web_resource_response_impl.cc', + 'aw_web_resource_response_impl.h', 'cookie_manager.cc', 'cookie_manager.h', 'input_stream_impl.cc', 'input_stream_impl.h', - 'intercepted_request_data_impl.cc', - 'intercepted_request_data_impl.h', 'java_browser_view_renderer_helper.cc', 'java_browser_view_renderer_helper.h', 'net_init_native_callback.cc', @@ -141,8 +141,8 @@ '../java/src/org/chromium/android_webview/AwResource.java', '../java/src/org/chromium/android_webview/AwSettings.java', '../java/src/org/chromium/android_webview/AwWebContentsDelegate.java', + '../java/src/org/chromium/android_webview/AwWebResourceResponse.java', '../java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java', - '../java/src/org/chromium/android_webview/InterceptedRequestData.java', '../java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java', '../java/src/org/chromium/android_webview/permission/AwPermissionRequest.java', ], diff --git a/android_webview/native/webview_native.target.darwin-arm.mk b/android_webview/native/webview_native.target.darwin-arm.mk index 3e2c74f3f0..1601925ab6 100644 --- a/android_webview/native/webview_native.target.darwin-arm.mk +++ b/android_webview/native/webview_native.target.darwin-arm.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 \ @@ -125,6 +125,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' \ '-DPOSIX_AVOID_MMAP' \ @@ -141,6 +142,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' \ @@ -267,6 +269,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' \ '-DPOSIX_AVOID_MMAP' \ @@ -283,6 +286,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' \ diff --git a/android_webview/native/webview_native.target.darwin-arm64.mk b/android_webview/native/webview_native.target.darwin-arm64.mk index 9e0036d359..2f361111be 100644 --- a/android_webview/native/webview_native.target.darwin-arm64.mk +++ b/android_webview/native/webview_native.target.darwin-arm64.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 \ @@ -115,6 +115,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' \ '-DPOSIX_AVOID_MMAP' \ @@ -131,6 +132,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' \ @@ -246,6 +248,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' \ '-DPOSIX_AVOID_MMAP' \ @@ -262,6 +265,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' \ diff --git a/android_webview/native/webview_native.target.darwin-mips.mk b/android_webview/native/webview_native.target.darwin-mips.mk index 689005a62d..c27a4ab7cd 100644 --- a/android_webview/native/webview_native.target.darwin-mips.mk +++ b/android_webview/native/webview_native.target.darwin-mips.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 \ @@ -119,6 +119,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' \ '-DPOSIX_AVOID_MMAP' \ @@ -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' \ '-DPOSIX_AVOID_MMAP' \ @@ -271,6 +274,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' \ diff --git a/android_webview/native/webview_native.target.darwin-x86.mk b/android_webview/native/webview_native.target.darwin-x86.mk index 3984346f6f..f1e061d6a4 100644 --- a/android_webview/native/webview_native.target.darwin-x86.mk +++ b/android_webview/native/webview_native.target.darwin-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' \ diff --git a/android_webview/native/webview_native.target.darwin-x86_64.mk b/android_webview/native/webview_native.target.darwin-x86_64.mk index 998a3ff78c..2ddc736158 100644 --- a/android_webview/native/webview_native.target.darwin-x86_64.mk +++ b/android_webview/native/webview_native.target.darwin-x86_64.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 \ @@ -119,6 +119,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' \ '-DPOSIX_AVOID_MMAP' \ @@ -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' \ '-DPOSIX_AVOID_MMAP' \ @@ -271,6 +274,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' \ diff --git a/android_webview/native/webview_native.target.linux-arm.mk b/android_webview/native/webview_native.target.linux-arm.mk index 3e2c74f3f0..1601925ab6 100644 --- a/android_webview/native/webview_native.target.linux-arm.mk +++ b/android_webview/native/webview_native.target.linux-arm.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 \ @@ -125,6 +125,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' \ '-DPOSIX_AVOID_MMAP' \ @@ -141,6 +142,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' \ @@ -267,6 +269,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' \ '-DPOSIX_AVOID_MMAP' \ @@ -283,6 +286,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' \ diff --git a/android_webview/native/webview_native.target.linux-arm64.mk b/android_webview/native/webview_native.target.linux-arm64.mk index 9e0036d359..2f361111be 100644 --- a/android_webview/native/webview_native.target.linux-arm64.mk +++ b/android_webview/native/webview_native.target.linux-arm64.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 \ @@ -115,6 +115,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' \ '-DPOSIX_AVOID_MMAP' \ @@ -131,6 +132,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' \ @@ -246,6 +248,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' \ '-DPOSIX_AVOID_MMAP' \ @@ -262,6 +265,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' \ diff --git a/android_webview/native/webview_native.target.linux-mips.mk b/android_webview/native/webview_native.target.linux-mips.mk index 689005a62d..c27a4ab7cd 100644 --- a/android_webview/native/webview_native.target.linux-mips.mk +++ b/android_webview/native/webview_native.target.linux-mips.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 \ @@ -119,6 +119,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' \ '-DPOSIX_AVOID_MMAP' \ @@ -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' \ '-DPOSIX_AVOID_MMAP' \ @@ -271,6 +274,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' \ 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' \ diff --git a/android_webview/native/webview_native.target.linux-x86_64.mk b/android_webview/native/webview_native.target.linux-x86_64.mk index 998a3ff78c..2ddc736158 100644 --- a/android_webview/native/webview_native.target.linux-x86_64.mk +++ b/android_webview/native/webview_native.target.linux-x86_64.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 \ @@ -119,6 +119,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' \ '-DPOSIX_AVOID_MMAP' \ @@ -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' \ '-DPOSIX_AVOID_MMAP' \ @@ -271,6 +274,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' \ diff --git a/android_webview/test/shell/res/values/config.xml b/android_webview/test/shell/res/values/config.xml new file mode 100644 index 0000000000..d87517024f --- /dev/null +++ b/android_webview/test/shell/res/values/config.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright 2014 The Chromium Authors. All rights reserved. + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. +--> + +<resources> + <!-- Array of "[keySystemName],[UuidOfMediaDrm]" --> + <string-array name="config_key_system_uuid_mapping" translatable="false"> + <!-- Use Widevine's UUID to pass the availability-test of MediaDRM plugin --> + <item>"com.oem.test-keysystem,EDEF8BA9-79D6-4ACE-A3C8-27DCD51D21ED"</item> + </string-array> +</resources> diff --git a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java index bfc81255ef..d086fe1877 100644 --- a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java +++ b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java @@ -25,6 +25,8 @@ public class AwShellResourceProvider { AwResource.setDefaultTextEncoding(R.string.default_encoding); + AwResource.setConfigKeySystemUuidMapping(R.array.config_key_system_uuid_mapping); + sInitialized = true; } } diff --git a/android_webview/test/shell/src/org/chromium/android_webview/test/NullContentsClient.java b/android_webview/test/shell/src/org/chromium/android_webview/test/NullContentsClient.java index 85c994b63b..b4f7a489e5 100644 --- a/android_webview/test/shell/src/org/chromium/android_webview/test/NullContentsClient.java +++ b/android_webview/test/shell/src/org/chromium/android_webview/test/NullContentsClient.java @@ -20,7 +20,7 @@ import android.webkit.WebChromeClient; import org.chromium.android_webview.AwContentsClient; import org.chromium.android_webview.AwContentsClientBridge; import org.chromium.android_webview.AwHttpAuthHandler; -import org.chromium.android_webview.InterceptedRequestData; +import org.chromium.android_webview.AwWebResourceResponse; import org.chromium.android_webview.JsPromptResultReceiver; import org.chromium.android_webview.JsResultReceiver; import org.chromium.android_webview.permission.AwPermissionRequest; @@ -66,7 +66,8 @@ public class NullContentsClient extends AwContentsClient { } @Override - public InterceptedRequestData shouldInterceptRequest(String url) { + public AwWebResourceResponse shouldInterceptRequest( + AwContentsClient.ShouldInterceptRequestParams params) { return null; } diff --git a/android_webview/tools/webview_licenses.py b/android_webview/tools/webview_licenses.py index b0c4b9c2e8..63a26e2154 100755 --- a/android_webview/tools/webview_licenses.py +++ b/android_webview/tools/webview_licenses.py @@ -230,7 +230,7 @@ def _FindThirdPartyDirs(): os.path.join('third_party', 'widevine'), # third_party directories in this tree aren't actually third party, but # provide a way to shadow experimental buildfiles into those directories. - os.path.join('tools', 'gn', 'secondary'), + os.path.join('build', 'secondary'), # Not shipped, Chromium code os.path.join('tools', 'swarming_client'), ] |