From 6d86b77056ed63eb6871182f42a9fd5f07550f90 Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Wed, 25 Jun 2014 10:30:53 +0100 Subject: Merge from Chromium at DEPS revision 278856 This commit was generated by merge_to_master.py. Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3 --- android_webview/Android.mk | 84 ++----- android_webview/android_webview.gyp | 28 ++- .../android_webview_common.target.darwin-arm.mk | 6 +- .../android_webview_common.target.darwin-arm64.mk | 6 +- .../android_webview_common.target.darwin-mips.mk | 6 +- .../android_webview_common.target.darwin-x86.mk | 6 +- .../android_webview_common.target.darwin-x86_64.mk | 6 +- .../android_webview_common.target.linux-arm.mk | 6 +- .../android_webview_common.target.linux-arm64.mk | 6 +- .../android_webview_common.target.linux-mips.mk | 6 +- .../android_webview_common.target.linux-x86.mk | 6 +- .../android_webview_common.target.linux-x86_64.mk | 6 +- ...w_jarjar_content_resources.target.darwin-arm.mk | 50 ++++ ...jarjar_content_resources.target.darwin-arm64.mk | 50 ++++ ..._jarjar_content_resources.target.darwin-mips.mk | 50 ++++ ...w_jarjar_content_resources.target.darwin-x86.mk | 50 ++++ ...arjar_content_resources.target.darwin-x86_64.mk | 50 ++++ ...ew_jarjar_content_resources.target.linux-arm.mk | 50 ++++ ..._jarjar_content_resources.target.linux-arm64.mk | 50 ++++ ...w_jarjar_content_resources.target.linux-mips.mk | 50 ++++ ...ew_jarjar_content_resources.target.linux-x86.mk | 50 ++++ ...jarjar_content_resources.target.linux-x86_64.mk | 50 ++++ ...ebview_jarjar_ui_resources.target.darwin-arm.mk | 50 ++++ ...view_jarjar_ui_resources.target.darwin-arm64.mk | 50 ++++ ...bview_jarjar_ui_resources.target.darwin-mips.mk | 50 ++++ ...ebview_jarjar_ui_resources.target.darwin-x86.mk | 50 ++++ ...iew_jarjar_ui_resources.target.darwin-x86_64.mk | 50 ++++ ...webview_jarjar_ui_resources.target.linux-arm.mk | 50 ++++ ...bview_jarjar_ui_resources.target.linux-arm64.mk | 50 ++++ ...ebview_jarjar_ui_resources.target.linux-mips.mk | 50 ++++ ...webview_jarjar_ui_resources.target.linux-x86.mk | 50 ++++ ...view_jarjar_ui_resources.target.linux-x86_64.mk | 50 ++++ .../android_webview_resources.target.darwin-arm.mk | 41 ++++ ...ndroid_webview_resources.target.darwin-arm64.mk | 41 ++++ ...android_webview_resources.target.darwin-mips.mk | 41 ++++ .../android_webview_resources.target.darwin-x86.mk | 41 ++++ ...droid_webview_resources.target.darwin-x86_64.mk | 41 ++++ .../android_webview_resources.target.linux-arm.mk | 41 ++++ ...android_webview_resources.target.linux-arm64.mk | 41 ++++ .../android_webview_resources.target.linux-mips.mk | 41 ++++ .../android_webview_resources.target.linux-x86.mk | 41 ++++ ...ndroid_webview_resources.target.linux-x86_64.mk | 41 ++++ .../android_webview_strings.target.darwin-arm.mk | 39 ---- .../android_webview_strings.target.darwin-arm64.mk | 39 ---- .../android_webview_strings.target.darwin-mips.mk | 39 ---- .../android_webview_strings.target.darwin-x86.mk | 39 ---- ...android_webview_strings.target.darwin-x86_64.mk | 39 ---- .../android_webview_strings.target.linux-arm.mk | 39 ---- .../android_webview_strings.target.linux-arm64.mk | 39 ---- .../android_webview_strings.target.linux-mips.mk | 39 ---- .../android_webview_strings.target.linux-x86.mk | 39 ---- .../android_webview_strings.target.linux-x86_64.mk | 39 ---- .../browser/aw_contents_io_thread_client.h | 4 +- android_webview/browser/aw_request_interceptor.cc | 24 +- android_webview/browser/aw_request_interceptor.h | 4 +- .../browser/aw_web_resource_response.cc | 88 +++++++ android_webview/browser/aw_web_resource_response.h | 60 +++++ .../browser/intercepted_request_data.cc | 70 ------ android_webview/browser/intercepted_request_data.h | 51 ----- .../net/android_stream_reader_url_request_job.cc | 4 + .../net/android_stream_reader_url_request_job.h | 4 + ...droid_stream_reader_url_request_job_unittest.cc | 64 ++++++ android_webview/build/AndroidManifest.xml | 4 + android_webview/build/jarjar_resources.gypi | 50 ++++ android_webview/build/resources_config.mk | 17 ++ android_webview/buildbot/aosp_manifest.xml | 2 +- android_webview/java/DEPS | 1 + .../chromium/android_webview/AwBrowserProcess.java | 18 ++ .../org/chromium/android_webview/AwContents.java | 23 +- .../chromium/android_webview/AwContentsClient.java | 20 +- .../android_webview/AwContentsIoThreadClient.java | 42 +++- .../org/chromium/android_webview/AwResource.java | 12 + .../android_webview/AwWebResourceResponse.java | 83 +++++++ .../DefaultVideoPosterRequestHandler.java | 6 +- .../android_webview/InterceptedRequestData.java | 41 ---- android_webview/java_library_common.mk | 65 ++++++ .../AwContentsClientGetDefaultVideoPosterTest.java | 6 +- ...AwContentsClientShouldInterceptRequestTest.java | 253 ++++++++++++++++----- ...ContentsClientShouldOverrideUrlLoadingTest.java | 58 +++-- .../android_webview/test/AwSettingsTest.java | 14 +- .../test/ClientOnPageFinishedTest.java | 10 +- .../test/CookieManagerStartupTest.java | 5 +- .../android_webview/test/KeySystemTest.java | 7 + .../android_webview/test/util/CommonResources.java | 18 ++ .../libwebviewchromium.target.darwin-arm.mk | 2 + .../libwebviewchromium.target.darwin-arm64.mk | 2 + .../libwebviewchromium.target.darwin-mips.mk | 2 + .../libwebviewchromium.target.darwin-x86.mk | 2 + .../libwebviewchromium.target.darwin-x86_64.mk | 2 + .../libwebviewchromium.target.linux-arm.mk | 2 + .../libwebviewchromium.target.linux-arm64.mk | 2 + .../libwebviewchromium.target.linux-mips.mk | 2 + .../libwebviewchromium.target.linux-x86.mk | 2 + .../libwebviewchromium.target.linux-x86_64.mk | 2 + android_webview/native/android_protocol_handler.cc | 10 + .../native/android_webview_jni_registrar.cc | 4 +- ...android_webview_native_jni.target.darwin-arm.mk | 26 ++- ...droid_webview_native_jni.target.darwin-arm64.mk | 26 ++- ...ndroid_webview_native_jni.target.darwin-mips.mk | 26 ++- ...android_webview_native_jni.target.darwin-x86.mk | 26 ++- ...roid_webview_native_jni.target.darwin-x86_64.mk | 26 ++- .../android_webview_native_jni.target.linux-arm.mk | 26 ++- ...ndroid_webview_native_jni.target.linux-arm64.mk | 26 ++- ...android_webview_native_jni.target.linux-mips.mk | 26 ++- .../android_webview_native_jni.target.linux-x86.mk | 26 ++- ...droid_webview_native_jni.target.linux-x86_64.mk | 26 ++- .../native/aw_contents_io_thread_client_impl.cc | 58 +++-- .../native/aw_contents_io_thread_client_impl.h | 5 +- .../native/aw_web_resource_response_impl.cc | 104 +++++++++ .../native/aw_web_resource_response_impl.h | 48 ++++ ...al_android_jar_jni_headers.target.darwin-arm.mk | 2 + ..._android_jar_jni_headers.target.darwin-arm64.mk | 2 + ...l_android_jar_jni_headers.target.darwin-mips.mk | 2 + ...al_android_jar_jni_headers.target.darwin-x86.mk | 2 + ...android_jar_jni_headers.target.darwin-x86_64.mk | 2 + ...nal_android_jar_jni_headers.target.linux-arm.mk | 2 + ...l_android_jar_jni_headers.target.linux-arm64.mk | 2 + ...al_android_jar_jni_headers.target.linux-mips.mk | 2 + ...nal_android_jar_jni_headers.target.linux-x86.mk | 2 + ..._android_jar_jni_headers.target.linux-x86_64.mk | 2 + ...am_android_jar_jni_headers.target.darwin-arm.mk | 2 + ..._android_jar_jni_headers.target.darwin-arm64.mk | 2 + ...m_android_jar_jni_headers.target.darwin-mips.mk | 2 + ...am_android_jar_jni_headers.target.darwin-x86.mk | 2 + ...android_jar_jni_headers.target.darwin-x86_64.mk | 2 + ...eam_android_jar_jni_headers.target.linux-arm.mk | 2 + ...m_android_jar_jni_headers.target.linux-arm64.mk | 2 + ...am_android_jar_jni_headers.target.linux-mips.mk | 2 + ...eam_android_jar_jni_headers.target.linux-x86.mk | 2 + ..._android_jar_jni_headers.target.linux-x86_64.mk | 2 + .../native/intercepted_request_data_impl.cc | 59 ----- .../native/intercepted_request_data_impl.h | 38 ---- android_webview/native/webview_native.gyp | 6 +- .../native/webview_native.target.darwin-arm.mk | 6 +- .../native/webview_native.target.darwin-arm64.mk | 6 +- .../native/webview_native.target.darwin-mips.mk | 6 +- .../native/webview_native.target.darwin-x86.mk | 6 +- .../native/webview_native.target.darwin-x86_64.mk | 6 +- .../native/webview_native.target.linux-arm.mk | 6 +- .../native/webview_native.target.linux-arm64.mk | 6 +- .../native/webview_native.target.linux-mips.mk | 6 +- .../native/webview_native.target.linux-x86.mk | 6 +- .../native/webview_native.target.linux-x86_64.mk | 6 +- android_webview/test/shell/res/values/config.xml | 13 ++ .../shell/AwShellResourceProvider.java | 2 + .../android_webview/test/NullContentsClient.java | 5 +- android_webview/tools/webview_licenses.py | 2 +- 147 files changed, 2816 insertions(+), 1018 deletions(-) create mode 100644 android_webview/android_webview_jarjar_content_resources.target.darwin-arm.mk create mode 100644 android_webview/android_webview_jarjar_content_resources.target.darwin-arm64.mk create mode 100644 android_webview/android_webview_jarjar_content_resources.target.darwin-mips.mk create mode 100644 android_webview/android_webview_jarjar_content_resources.target.darwin-x86.mk create mode 100644 android_webview/android_webview_jarjar_content_resources.target.darwin-x86_64.mk create mode 100644 android_webview/android_webview_jarjar_content_resources.target.linux-arm.mk create mode 100644 android_webview/android_webview_jarjar_content_resources.target.linux-arm64.mk create mode 100644 android_webview/android_webview_jarjar_content_resources.target.linux-mips.mk create mode 100644 android_webview/android_webview_jarjar_content_resources.target.linux-x86.mk create mode 100644 android_webview/android_webview_jarjar_content_resources.target.linux-x86_64.mk create mode 100644 android_webview/android_webview_jarjar_ui_resources.target.darwin-arm.mk create mode 100644 android_webview/android_webview_jarjar_ui_resources.target.darwin-arm64.mk create mode 100644 android_webview/android_webview_jarjar_ui_resources.target.darwin-mips.mk create mode 100644 android_webview/android_webview_jarjar_ui_resources.target.darwin-x86.mk create mode 100644 android_webview/android_webview_jarjar_ui_resources.target.darwin-x86_64.mk create mode 100644 android_webview/android_webview_jarjar_ui_resources.target.linux-arm.mk create mode 100644 android_webview/android_webview_jarjar_ui_resources.target.linux-arm64.mk create mode 100644 android_webview/android_webview_jarjar_ui_resources.target.linux-mips.mk create mode 100644 android_webview/android_webview_jarjar_ui_resources.target.linux-x86.mk create mode 100644 android_webview/android_webview_jarjar_ui_resources.target.linux-x86_64.mk create mode 100644 android_webview/android_webview_resources.target.darwin-arm.mk create mode 100644 android_webview/android_webview_resources.target.darwin-arm64.mk create mode 100644 android_webview/android_webview_resources.target.darwin-mips.mk create mode 100644 android_webview/android_webview_resources.target.darwin-x86.mk create mode 100644 android_webview/android_webview_resources.target.darwin-x86_64.mk create mode 100644 android_webview/android_webview_resources.target.linux-arm.mk create mode 100644 android_webview/android_webview_resources.target.linux-arm64.mk create mode 100644 android_webview/android_webview_resources.target.linux-mips.mk create mode 100644 android_webview/android_webview_resources.target.linux-x86.mk create mode 100644 android_webview/android_webview_resources.target.linux-x86_64.mk delete mode 100644 android_webview/android_webview_strings.target.darwin-arm.mk delete mode 100644 android_webview/android_webview_strings.target.darwin-arm64.mk delete mode 100644 android_webview/android_webview_strings.target.darwin-mips.mk delete mode 100644 android_webview/android_webview_strings.target.darwin-x86.mk delete mode 100644 android_webview/android_webview_strings.target.darwin-x86_64.mk delete mode 100644 android_webview/android_webview_strings.target.linux-arm.mk delete mode 100644 android_webview/android_webview_strings.target.linux-arm64.mk delete mode 100644 android_webview/android_webview_strings.target.linux-mips.mk delete mode 100644 android_webview/android_webview_strings.target.linux-x86.mk delete mode 100644 android_webview/android_webview_strings.target.linux-x86_64.mk create mode 100644 android_webview/browser/aw_web_resource_response.cc create mode 100644 android_webview/browser/aw_web_resource_response.h delete mode 100644 android_webview/browser/intercepted_request_data.cc delete mode 100644 android_webview/browser/intercepted_request_data.h create mode 100644 android_webview/build/AndroidManifest.xml create mode 100644 android_webview/build/jarjar_resources.gypi create mode 100644 android_webview/build/resources_config.mk create mode 100644 android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java delete mode 100644 android_webview/java/src/org/chromium/android_webview/InterceptedRequestData.java create mode 100644 android_webview/java_library_common.mk create mode 100644 android_webview/native/aw_web_resource_response_impl.cc create mode 100644 android_webview/native/aw_web_resource_response_impl.h delete mode 100644 android_webview/native/intercepted_request_data_impl.cc delete mode 100644 android_webview/native/intercepted_request_data_impl.h create mode 100644 android_webview/test/shell/res/values/config.xml (limited to 'android_webview') 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_resources.target.darwin-arm.mk b/android_webview/android_webview_resources.target.darwin-arm.mk new file mode 100644 index 0000000000..36508589e2 --- /dev/null +++ b/android_webview/android_webview_resources.target.darwin-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.darwin-arm64.mk b/android_webview/android_webview_resources.target.darwin-arm64.mk new file mode 100644 index 0000000000..36508589e2 --- /dev/null +++ b/android_webview/android_webview_resources.target.darwin-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.darwin-mips.mk b/android_webview/android_webview_resources.target.darwin-mips.mk new file mode 100644 index 0000000000..36508589e2 --- /dev/null +++ b/android_webview/android_webview_resources.target.darwin-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.darwin-x86.mk b/android_webview/android_webview_resources.target.darwin-x86.mk new file mode 100644 index 0000000000..36508589e2 --- /dev/null +++ b/android_webview/android_webview_resources.target.darwin-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.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-arm.mk b/android_webview/android_webview_strings.target.darwin-arm.mk deleted file mode 100644 index a70971bf12..0000000000 --- a/android_webview/android_webview_strings.target.darwin-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.darwin-arm64.mk b/android_webview/android_webview_strings.target.darwin-arm64.mk deleted file mode 100644 index a70971bf12..0000000000 --- a/android_webview/android_webview_strings.target.darwin-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.darwin-mips.mk b/android_webview/android_webview_strings.target.darwin-mips.mk deleted file mode 100644 index a70971bf12..0000000000 --- a/android_webview/android_webview_strings.target.darwin-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.darwin-x86.mk b/android_webview/android_webview_strings.target.darwin-x86.mk deleted file mode 100644 index a70971bf12..0000000000 --- a/android_webview/android_webview_strings.target.darwin-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.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 ShouldInterceptRequest( + virtual scoped_ptr 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 -AwRequestInterceptor::QueryForInterceptedRequestData( +scoped_ptr +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(); + return scoped_ptr(); scoped_ptr io_thread_client = AwContentsIoThreadClient::FromID(render_process_id, render_frame_id); if (!io_thread_client.get()) - return scoped_ptr(); + return scoped_ptr(); 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 intercepted_request_data = - QueryForInterceptedRequestData(request->url(), request); + scoped_ptr 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 QueryForInterceptedRequestData( + scoped_ptr QueryForAwWebResourceResponse( const GURL& location, net::URLRequest* request) const; diff --git a/android_webview/browser/aw_web_resource_response.cc b/android_webview/browser/aw_web_resource_response.cc new file mode 100644 index 0000000000..412d9c2a04 --- /dev/null +++ b/android_webview/browser/aw_web_resource_response.cc @@ -0,0 +1,88 @@ +// 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/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 { + +namespace { + +class StreamReaderJobDelegateImpl + : public AndroidStreamReaderURLRequestJob::Delegate { + public: + StreamReaderJobDelegateImpl( + scoped_ptr aw_web_resource_response) + : aw_web_resource_response_(aw_web_resource_response.Pass()) { + DCHECK(aw_web_resource_response_); + } + + virtual scoped_ptr OpenInputStream(JNIEnv* env, + const GURL& url) OVERRIDE { + return aw_web_resource_response_->GetInputStream(env).Pass(); + } + + virtual void OnInputStreamOpenFailed(net::URLRequest* request, + bool* restart) OVERRIDE { + *restart = false; + } + + virtual bool GetMimeType(JNIEnv* env, + net::URLRequest* request, + android_webview::InputStream* stream, + std::string* mime_type) OVERRIDE { + 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 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 aw_web_resource_response_; +}; + +} // namespace + +// static +net::URLRequestJob* AwWebResourceResponse::CreateJobFor( + scoped_ptr aw_web_resource_response, + net::URLRequest* request, + net::NetworkDelegate* network_delegate) { + DCHECK(aw_web_resource_response); + DCHECK(request); + DCHECK(network_delegate); + + return new AndroidStreamReaderURLRequestJob( + request, + network_delegate, + make_scoped_ptr( + new StreamReaderJobDelegateImpl(aw_web_resource_response.Pass())) + .PassAs()); +} + +} // namespace android_webview diff --git a/android_webview/browser/aw_web_resource_response.h b/android_webview/browser/aw_web_resource_response.h new file mode 100644 index 0000000000..34963606ff --- /dev/null +++ b/android_webview/browser/aw_web_resource_response.h @@ -0,0 +1,60 @@ +// 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_BROWSER_INTERCEPTED_REQUEST_DATA_H_ +#define ANDROID_WEBVIEW_BROWSER_INTERCEPTED_REQUEST_DATA_H_ + +#include + +#include "base/android/jni_android.h" +#include "base/memory/scoped_ptr.h" + +namespace net { +class HttpResponseHeaders; +class NetworkDelegate; +class URLRequest; +class URLRequestJob; +} + +namespace android_webview { + +class InputStream; + +// This class represents the Java-side data that is to be used to complete a +// particular URLRequest. +class AwWebResourceResponse { + public: + virtual ~AwWebResourceResponse() {} + + virtual scoped_ptr 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 |aw_web_resource_response| structure (instead of going to the network + // or to the cache). + // The newly created job takes ownership of |aw_web_resource_response|. + static net::URLRequestJob* CreateJobFor( + scoped_ptr aw_web_resource_response, + net::URLRequest* request, + net::NetworkDelegate* network_delegate); + + protected: + AwWebResourceResponse() {} + + private: + DISALLOW_COPY_AND_ASSIGN(AwWebResourceResponse); +}; + +} // namespace android_webview + +#endif // ANDROID_WEBVIEW_BROWSER_INTERCEPTED_REQUEST_DATA_H_ diff --git a/android_webview/browser/intercepted_request_data.cc b/android_webview/browser/intercepted_request_data.cc deleted file mode 100644 index 6e25ce1447..0000000000 --- a/android_webview/browser/intercepted_request_data.cc +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright 2013 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/input_stream.h" -#include "android_webview/browser/net/android_stream_reader_url_request_job.h" - -namespace android_webview { - -namespace { - -class StreamReaderJobDelegateImpl - : public AndroidStreamReaderURLRequestJob::Delegate { - public: - StreamReaderJobDelegateImpl( - scoped_ptr intercepted_request_data) - : intercepted_request_data_(intercepted_request_data.Pass()) { - DCHECK(intercepted_request_data_); - } - - virtual scoped_ptr OpenInputStream(JNIEnv* env, - const GURL& url) OVERRIDE { - return intercepted_request_data_->GetInputStream(env).Pass(); - } - - virtual void OnInputStreamOpenFailed(net::URLRequest* request, - bool* restart) OVERRIDE { - *restart = false; - } - - virtual bool GetMimeType(JNIEnv* env, - net::URLRequest* request, - android_webview::InputStream* stream, - std::string* mime_type) OVERRIDE { - return intercepted_request_data_->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); - } - - private: - scoped_ptr intercepted_request_data_; -}; - -} // namespace - -// static -net::URLRequestJob* InterceptedRequestData::CreateJobFor( - scoped_ptr intercepted_request_data, - net::URLRequest* request, - net::NetworkDelegate* network_delegate) { - DCHECK(intercepted_request_data); - DCHECK(request); - DCHECK(network_delegate); - - return new AndroidStreamReaderURLRequestJob( - request, - network_delegate, - make_scoped_ptr( - new StreamReaderJobDelegateImpl(intercepted_request_data.Pass())) - .PassAs()); -} - -} // namespace android_webview diff --git a/android_webview/browser/intercepted_request_data.h b/android_webview/browser/intercepted_request_data.h deleted file mode 100644 index acf031d338..0000000000 --- a/android_webview/browser/intercepted_request_data.h +++ /dev/null @@ -1,51 +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. - -#ifndef ANDROID_WEBVIEW_BROWSER_INTERCEPTED_REQUEST_DATA_H_ -#define ANDROID_WEBVIEW_BROWSER_INTERCEPTED_REQUEST_DATA_H_ - -#include - -#include "base/android/jni_android.h" -#include "base/memory/scoped_ptr.h" - -namespace net { -class URLRequest; -class URLRequestJob; -class NetworkDelegate; -} - -namespace android_webview { - -class InputStream; - -// This class represents the Java-side data that is to be used to complete a -// particular URLRequest. -class InterceptedRequestData { - public: - virtual ~InterceptedRequestData() {} - - virtual scoped_ptr 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; - - // This creates a URLRequestJob for the |request| wich will read data from - // the |intercepted_request_data| structure (instead of going to the network - // or to the cache). - // The newly created job takes ownership of |intercepted_request_data|. - static net::URLRequestJob* CreateJobFor( - scoped_ptr intercepted_request_data, - net::URLRequest* request, - net::NetworkDelegate* network_delegate); - - protected: - InterceptedRequestData() {} - - private: - DISALLOW_COPY_AND_ASSIGN(InterceptedRequestData); -}; - -} // namespace android_webview - -#endif // ANDROID_WEBVIEW_BROWSER_INTERCEPTED_REQUEST_DATA_H_ 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(), + make_scoped_ptr(new HeaderAlteringStreamReaderDelegate()) + .PassAs()); + 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 @@ + + + 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': ['@(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 @@ - + 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 requestHeaders; + } + public abstract void getVisitedHistory(ValueCallback 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(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 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 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 mShouldInterceptRequestUrls = new ArrayList(); - private ConcurrentHashMap mReturnValuesByUrls - = new ConcurrentHashMap(); + private ConcurrentHashMap mReturnValuesByUrls + = new ConcurrentHashMap(); + private ConcurrentHashMap mParamsByUrls + = new ConcurrentHashMap(); // 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 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> headers = new ArrayList>(); 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, @@ -167,6 +182,95 @@ public class AwContentsClientShouldInterceptRequestTest extends AwTestBase { assertEquals(CommonResources.ABOUT_TITLE, getTitleOnUiThread(mAwContents)); } + @SmallTest + @Feature({"AndroidWebView"}) + public void testCalledWithCorrectIsMainFrameParam() throws Throwable { + final String subframeUrl = addAboutPageToTestServer(mWebServer); + final String pageWithIframeUrl = addPageToTestServer(mWebServer, "/page_with_iframe.html", + CommonResources.makeHtmlPageFrom("", + "