Re-generate .mk files after "Cherry-pick: Revert "Merge 281715 "[Android WebView] Terminate execution of stuck JS ..."""
As the patch was changing android_webview.gyp file, we have to update .mk files
Bug: 13509205, 17175122, 17173843
Change-Id: I0b736bb8ced4e63040b6c203cc29dbebb78aaaa0
diff --git a/android_webview/android_webview_common.target.darwin-arm.mk b/android_webview/android_webview_common.target.darwin-arm.mk
index 5a0a658..afd8bd2 100644
--- a/android_webview/android_webview_common.target.darwin-arm.mk
+++ b/android_webview/android_webview_common.target.darwin-arm.mk
@@ -16,7 +16,6 @@
$(call intermediates-dir-for,GYP,skia_skia_gyp,,,$(GYP_VAR_PREFIX))/skia.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp,,,$(GYP_VAR_PREFIX))/blink.stamp \
- $(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp,,,$(GYP_VAR_PREFIX))/v8.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp,,,$(GYP_VAR_PREFIX))/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,GYP,android_webview_android_webview_pak_gyp,,,$(GYP_VAR_PREFIX))/android_webview_pak.stamp
@@ -80,7 +79,6 @@
android_webview/lib/aw_browser_dependency_factory_impl.cc \
android_webview/lib/main/aw_main_delegate.cc \
android_webview/renderer/aw_content_renderer_client.cc \
- android_webview/renderer/aw_execution_termination_filter.cc \
android_webview/renderer/aw_key_systems.cc \
android_webview/renderer/aw_permission_client.cc \
android_webview/renderer/aw_render_process_observer.cc \
@@ -226,6 +224,7 @@
$(PWD)/external/icu/icu4c/source/i18n \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
+ $(LOCAL_PATH)/v8/include \
$(LOCAL_PATH)/third_party/libpng \
$(LOCAL_PATH)/third_party/zlib \
$(LOCAL_PATH)/third_party/libwebp \
@@ -233,7 +232,6 @@
$(LOCAL_PATH)/third_party/qcms/src \
$(LOCAL_PATH)/third_party/iccjpeg \
$(PWD)/external/jpeg \
- $(LOCAL_PATH)/v8/include \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
$(PWD)/frameworks/wilhelm/include \
@@ -390,6 +388,7 @@
$(PWD)/external/icu/icu4c/source/i18n \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
+ $(LOCAL_PATH)/v8/include \
$(LOCAL_PATH)/third_party/libpng \
$(LOCAL_PATH)/third_party/zlib \
$(LOCAL_PATH)/third_party/libwebp \
@@ -397,7 +396,6 @@
$(LOCAL_PATH)/third_party/qcms/src \
$(LOCAL_PATH)/third_party/iccjpeg \
$(PWD)/external/jpeg \
- $(LOCAL_PATH)/v8/include \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
$(PWD)/frameworks/wilhelm/include \
diff --git a/android_webview/android_webview_common.target.darwin-arm64.mk b/android_webview/android_webview_common.target.darwin-arm64.mk
index e94239f..89e24fb 100644
--- a/android_webview/android_webview_common.target.darwin-arm64.mk
+++ b/android_webview/android_webview_common.target.darwin-arm64.mk
@@ -16,7 +16,6 @@
$(call intermediates-dir-for,GYP,skia_skia_gyp,,,$(GYP_VAR_PREFIX))/skia.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp,,,$(GYP_VAR_PREFIX))/blink.stamp \
- $(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp,,,$(GYP_VAR_PREFIX))/v8.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp,,,$(GYP_VAR_PREFIX))/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,GYP,android_webview_android_webview_pak_gyp,,,$(GYP_VAR_PREFIX))/android_webview_pak.stamp
@@ -80,7 +79,6 @@
android_webview/lib/aw_browser_dependency_factory_impl.cc \
android_webview/lib/main/aw_main_delegate.cc \
android_webview/renderer/aw_content_renderer_client.cc \
- android_webview/renderer/aw_execution_termination_filter.cc \
android_webview/renderer/aw_key_systems.cc \
android_webview/renderer/aw_permission_client.cc \
android_webview/renderer/aw_render_process_observer.cc \
@@ -215,6 +213,7 @@
$(PWD)/external/icu/icu4c/source/i18n \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
+ $(LOCAL_PATH)/v8/include \
$(LOCAL_PATH)/third_party/libpng \
$(LOCAL_PATH)/third_party/zlib \
$(LOCAL_PATH)/third_party/libwebp \
@@ -222,7 +221,6 @@
$(LOCAL_PATH)/third_party/qcms/src \
$(LOCAL_PATH)/third_party/iccjpeg \
$(PWD)/external/jpeg \
- $(LOCAL_PATH)/v8/include \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
$(PWD)/frameworks/wilhelm/include \
@@ -367,6 +365,7 @@
$(PWD)/external/icu/icu4c/source/i18n \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
+ $(LOCAL_PATH)/v8/include \
$(LOCAL_PATH)/third_party/libpng \
$(LOCAL_PATH)/third_party/zlib \
$(LOCAL_PATH)/third_party/libwebp \
@@ -374,7 +373,6 @@
$(LOCAL_PATH)/third_party/qcms/src \
$(LOCAL_PATH)/third_party/iccjpeg \
$(PWD)/external/jpeg \
- $(LOCAL_PATH)/v8/include \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
$(PWD)/frameworks/wilhelm/include \
diff --git a/android_webview/android_webview_common.target.darwin-mips.mk b/android_webview/android_webview_common.target.darwin-mips.mk
index 8d69dde..0fb69a1 100644
--- a/android_webview/android_webview_common.target.darwin-mips.mk
+++ b/android_webview/android_webview_common.target.darwin-mips.mk
@@ -16,7 +16,6 @@
$(call intermediates-dir-for,GYP,skia_skia_gyp,,,$(GYP_VAR_PREFIX))/skia.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp,,,$(GYP_VAR_PREFIX))/blink.stamp \
- $(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp,,,$(GYP_VAR_PREFIX))/v8.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp,,,$(GYP_VAR_PREFIX))/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,GYP,android_webview_android_webview_pak_gyp,,,$(GYP_VAR_PREFIX))/android_webview_pak.stamp
@@ -80,7 +79,6 @@
android_webview/lib/aw_browser_dependency_factory_impl.cc \
android_webview/lib/main/aw_main_delegate.cc \
android_webview/renderer/aw_content_renderer_client.cc \
- android_webview/renderer/aw_execution_termination_filter.cc \
android_webview/renderer/aw_key_systems.cc \
android_webview/renderer/aw_permission_client.cc \
android_webview/renderer/aw_render_process_observer.cc \
@@ -220,6 +218,7 @@
$(PWD)/external/icu/icu4c/source/i18n \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
+ $(LOCAL_PATH)/v8/include \
$(LOCAL_PATH)/third_party/libpng \
$(LOCAL_PATH)/third_party/zlib \
$(LOCAL_PATH)/third_party/libwebp \
@@ -227,7 +226,6 @@
$(LOCAL_PATH)/third_party/qcms/src \
$(LOCAL_PATH)/third_party/iccjpeg \
$(PWD)/external/jpeg \
- $(LOCAL_PATH)/v8/include \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
$(PWD)/frameworks/wilhelm/include \
@@ -378,6 +376,7 @@
$(PWD)/external/icu/icu4c/source/i18n \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
+ $(LOCAL_PATH)/v8/include \
$(LOCAL_PATH)/third_party/libpng \
$(LOCAL_PATH)/third_party/zlib \
$(LOCAL_PATH)/third_party/libwebp \
@@ -385,7 +384,6 @@
$(LOCAL_PATH)/third_party/qcms/src \
$(LOCAL_PATH)/third_party/iccjpeg \
$(PWD)/external/jpeg \
- $(LOCAL_PATH)/v8/include \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
$(PWD)/frameworks/wilhelm/include \
diff --git a/android_webview/android_webview_common.target.darwin-x86.mk b/android_webview/android_webview_common.target.darwin-x86.mk
index 0a3f0b2..75655d1 100644
--- a/android_webview/android_webview_common.target.darwin-x86.mk
+++ b/android_webview/android_webview_common.target.darwin-x86.mk
@@ -16,7 +16,6 @@
$(call intermediates-dir-for,GYP,skia_skia_gyp,,,$(GYP_VAR_PREFIX))/skia.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp,,,$(GYP_VAR_PREFIX))/blink.stamp \
- $(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp,,,$(GYP_VAR_PREFIX))/v8.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp,,,$(GYP_VAR_PREFIX))/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,GYP,android_webview_android_webview_pak_gyp,,,$(GYP_VAR_PREFIX))/android_webview_pak.stamp
@@ -80,7 +79,6 @@
android_webview/lib/aw_browser_dependency_factory_impl.cc \
android_webview/lib/main/aw_main_delegate.cc \
android_webview/renderer/aw_content_renderer_client.cc \
- android_webview/renderer/aw_execution_termination_filter.cc \
android_webview/renderer/aw_key_systems.cc \
android_webview/renderer/aw_permission_client.cc \
android_webview/renderer/aw_render_process_observer.cc \
@@ -221,6 +219,7 @@
$(PWD)/external/icu/icu4c/source/i18n \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
+ $(LOCAL_PATH)/v8/include \
$(LOCAL_PATH)/third_party/libpng \
$(LOCAL_PATH)/third_party/zlib \
$(LOCAL_PATH)/third_party/libwebp \
@@ -228,7 +227,6 @@
$(LOCAL_PATH)/third_party/qcms/src \
$(LOCAL_PATH)/third_party/iccjpeg \
$(PWD)/external/jpeg \
- $(LOCAL_PATH)/v8/include \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
$(PWD)/frameworks/wilhelm/include \
@@ -379,6 +377,7 @@
$(PWD)/external/icu/icu4c/source/i18n \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
+ $(LOCAL_PATH)/v8/include \
$(LOCAL_PATH)/third_party/libpng \
$(LOCAL_PATH)/third_party/zlib \
$(LOCAL_PATH)/third_party/libwebp \
@@ -386,7 +385,6 @@
$(LOCAL_PATH)/third_party/qcms/src \
$(LOCAL_PATH)/third_party/iccjpeg \
$(PWD)/external/jpeg \
- $(LOCAL_PATH)/v8/include \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
$(PWD)/frameworks/wilhelm/include \
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 3f127e1..776aed5 100644
--- a/android_webview/android_webview_common.target.darwin-x86_64.mk
+++ b/android_webview/android_webview_common.target.darwin-x86_64.mk
@@ -16,7 +16,6 @@
$(call intermediates-dir-for,GYP,skia_skia_gyp,,,$(GYP_VAR_PREFIX))/skia.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp,,,$(GYP_VAR_PREFIX))/blink.stamp \
- $(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp,,,$(GYP_VAR_PREFIX))/v8.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp,,,$(GYP_VAR_PREFIX))/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,GYP,android_webview_android_webview_pak_gyp,,,$(GYP_VAR_PREFIX))/android_webview_pak.stamp
@@ -80,7 +79,6 @@
android_webview/lib/aw_browser_dependency_factory_impl.cc \
android_webview/lib/main/aw_main_delegate.cc \
android_webview/renderer/aw_content_renderer_client.cc \
- android_webview/renderer/aw_execution_termination_filter.cc \
android_webview/renderer/aw_key_systems.cc \
android_webview/renderer/aw_permission_client.cc \
android_webview/renderer/aw_render_process_observer.cc \
@@ -220,6 +218,7 @@
$(PWD)/external/icu/icu4c/source/i18n \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
+ $(LOCAL_PATH)/v8/include \
$(LOCAL_PATH)/third_party/libpng \
$(LOCAL_PATH)/third_party/zlib \
$(LOCAL_PATH)/third_party/libwebp \
@@ -227,7 +226,6 @@
$(LOCAL_PATH)/third_party/qcms/src \
$(LOCAL_PATH)/third_party/iccjpeg \
$(PWD)/external/jpeg \
- $(LOCAL_PATH)/v8/include \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
$(PWD)/frameworks/wilhelm/include \
@@ -377,6 +375,7 @@
$(PWD)/external/icu/icu4c/source/i18n \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
+ $(LOCAL_PATH)/v8/include \
$(LOCAL_PATH)/third_party/libpng \
$(LOCAL_PATH)/third_party/zlib \
$(LOCAL_PATH)/third_party/libwebp \
@@ -384,7 +383,6 @@
$(LOCAL_PATH)/third_party/qcms/src \
$(LOCAL_PATH)/third_party/iccjpeg \
$(PWD)/external/jpeg \
- $(LOCAL_PATH)/v8/include \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
$(PWD)/frameworks/wilhelm/include \
diff --git a/android_webview/android_webview_common.target.linux-arm.mk b/android_webview/android_webview_common.target.linux-arm.mk
index 5a0a658..afd8bd2 100644
--- a/android_webview/android_webview_common.target.linux-arm.mk
+++ b/android_webview/android_webview_common.target.linux-arm.mk
@@ -16,7 +16,6 @@
$(call intermediates-dir-for,GYP,skia_skia_gyp,,,$(GYP_VAR_PREFIX))/skia.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp,,,$(GYP_VAR_PREFIX))/blink.stamp \
- $(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp,,,$(GYP_VAR_PREFIX))/v8.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp,,,$(GYP_VAR_PREFIX))/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,GYP,android_webview_android_webview_pak_gyp,,,$(GYP_VAR_PREFIX))/android_webview_pak.stamp
@@ -80,7 +79,6 @@
android_webview/lib/aw_browser_dependency_factory_impl.cc \
android_webview/lib/main/aw_main_delegate.cc \
android_webview/renderer/aw_content_renderer_client.cc \
- android_webview/renderer/aw_execution_termination_filter.cc \
android_webview/renderer/aw_key_systems.cc \
android_webview/renderer/aw_permission_client.cc \
android_webview/renderer/aw_render_process_observer.cc \
@@ -226,6 +224,7 @@
$(PWD)/external/icu/icu4c/source/i18n \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
+ $(LOCAL_PATH)/v8/include \
$(LOCAL_PATH)/third_party/libpng \
$(LOCAL_PATH)/third_party/zlib \
$(LOCAL_PATH)/third_party/libwebp \
@@ -233,7 +232,6 @@
$(LOCAL_PATH)/third_party/qcms/src \
$(LOCAL_PATH)/third_party/iccjpeg \
$(PWD)/external/jpeg \
- $(LOCAL_PATH)/v8/include \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
$(PWD)/frameworks/wilhelm/include \
@@ -390,6 +388,7 @@
$(PWD)/external/icu/icu4c/source/i18n \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
+ $(LOCAL_PATH)/v8/include \
$(LOCAL_PATH)/third_party/libpng \
$(LOCAL_PATH)/third_party/zlib \
$(LOCAL_PATH)/third_party/libwebp \
@@ -397,7 +396,6 @@
$(LOCAL_PATH)/third_party/qcms/src \
$(LOCAL_PATH)/third_party/iccjpeg \
$(PWD)/external/jpeg \
- $(LOCAL_PATH)/v8/include \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
$(PWD)/frameworks/wilhelm/include \
diff --git a/android_webview/android_webview_common.target.linux-arm64.mk b/android_webview/android_webview_common.target.linux-arm64.mk
index e94239f..89e24fb 100644
--- a/android_webview/android_webview_common.target.linux-arm64.mk
+++ b/android_webview/android_webview_common.target.linux-arm64.mk
@@ -16,7 +16,6 @@
$(call intermediates-dir-for,GYP,skia_skia_gyp,,,$(GYP_VAR_PREFIX))/skia.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp,,,$(GYP_VAR_PREFIX))/blink.stamp \
- $(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp,,,$(GYP_VAR_PREFIX))/v8.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp,,,$(GYP_VAR_PREFIX))/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,GYP,android_webview_android_webview_pak_gyp,,,$(GYP_VAR_PREFIX))/android_webview_pak.stamp
@@ -80,7 +79,6 @@
android_webview/lib/aw_browser_dependency_factory_impl.cc \
android_webview/lib/main/aw_main_delegate.cc \
android_webview/renderer/aw_content_renderer_client.cc \
- android_webview/renderer/aw_execution_termination_filter.cc \
android_webview/renderer/aw_key_systems.cc \
android_webview/renderer/aw_permission_client.cc \
android_webview/renderer/aw_render_process_observer.cc \
@@ -215,6 +213,7 @@
$(PWD)/external/icu/icu4c/source/i18n \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
+ $(LOCAL_PATH)/v8/include \
$(LOCAL_PATH)/third_party/libpng \
$(LOCAL_PATH)/third_party/zlib \
$(LOCAL_PATH)/third_party/libwebp \
@@ -222,7 +221,6 @@
$(LOCAL_PATH)/third_party/qcms/src \
$(LOCAL_PATH)/third_party/iccjpeg \
$(PWD)/external/jpeg \
- $(LOCAL_PATH)/v8/include \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
$(PWD)/frameworks/wilhelm/include \
@@ -367,6 +365,7 @@
$(PWD)/external/icu/icu4c/source/i18n \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
+ $(LOCAL_PATH)/v8/include \
$(LOCAL_PATH)/third_party/libpng \
$(LOCAL_PATH)/third_party/zlib \
$(LOCAL_PATH)/third_party/libwebp \
@@ -374,7 +373,6 @@
$(LOCAL_PATH)/third_party/qcms/src \
$(LOCAL_PATH)/third_party/iccjpeg \
$(PWD)/external/jpeg \
- $(LOCAL_PATH)/v8/include \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
$(PWD)/frameworks/wilhelm/include \
diff --git a/android_webview/android_webview_common.target.linux-mips.mk b/android_webview/android_webview_common.target.linux-mips.mk
index 8d69dde..0fb69a1 100644
--- a/android_webview/android_webview_common.target.linux-mips.mk
+++ b/android_webview/android_webview_common.target.linux-mips.mk
@@ -16,7 +16,6 @@
$(call intermediates-dir-for,GYP,skia_skia_gyp,,,$(GYP_VAR_PREFIX))/skia.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp,,,$(GYP_VAR_PREFIX))/blink.stamp \
- $(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp,,,$(GYP_VAR_PREFIX))/v8.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp,,,$(GYP_VAR_PREFIX))/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,GYP,android_webview_android_webview_pak_gyp,,,$(GYP_VAR_PREFIX))/android_webview_pak.stamp
@@ -80,7 +79,6 @@
android_webview/lib/aw_browser_dependency_factory_impl.cc \
android_webview/lib/main/aw_main_delegate.cc \
android_webview/renderer/aw_content_renderer_client.cc \
- android_webview/renderer/aw_execution_termination_filter.cc \
android_webview/renderer/aw_key_systems.cc \
android_webview/renderer/aw_permission_client.cc \
android_webview/renderer/aw_render_process_observer.cc \
@@ -220,6 +218,7 @@
$(PWD)/external/icu/icu4c/source/i18n \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
+ $(LOCAL_PATH)/v8/include \
$(LOCAL_PATH)/third_party/libpng \
$(LOCAL_PATH)/third_party/zlib \
$(LOCAL_PATH)/third_party/libwebp \
@@ -227,7 +226,6 @@
$(LOCAL_PATH)/third_party/qcms/src \
$(LOCAL_PATH)/third_party/iccjpeg \
$(PWD)/external/jpeg \
- $(LOCAL_PATH)/v8/include \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
$(PWD)/frameworks/wilhelm/include \
@@ -378,6 +376,7 @@
$(PWD)/external/icu/icu4c/source/i18n \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
+ $(LOCAL_PATH)/v8/include \
$(LOCAL_PATH)/third_party/libpng \
$(LOCAL_PATH)/third_party/zlib \
$(LOCAL_PATH)/third_party/libwebp \
@@ -385,7 +384,6 @@
$(LOCAL_PATH)/third_party/qcms/src \
$(LOCAL_PATH)/third_party/iccjpeg \
$(PWD)/external/jpeg \
- $(LOCAL_PATH)/v8/include \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
$(PWD)/frameworks/wilhelm/include \
diff --git a/android_webview/android_webview_common.target.linux-x86.mk b/android_webview/android_webview_common.target.linux-x86.mk
index 0a3f0b2..75655d1 100644
--- a/android_webview/android_webview_common.target.linux-x86.mk
+++ b/android_webview/android_webview_common.target.linux-x86.mk
@@ -16,7 +16,6 @@
$(call intermediates-dir-for,GYP,skia_skia_gyp,,,$(GYP_VAR_PREFIX))/skia.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp,,,$(GYP_VAR_PREFIX))/blink.stamp \
- $(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp,,,$(GYP_VAR_PREFIX))/v8.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp,,,$(GYP_VAR_PREFIX))/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,GYP,android_webview_android_webview_pak_gyp,,,$(GYP_VAR_PREFIX))/android_webview_pak.stamp
@@ -80,7 +79,6 @@
android_webview/lib/aw_browser_dependency_factory_impl.cc \
android_webview/lib/main/aw_main_delegate.cc \
android_webview/renderer/aw_content_renderer_client.cc \
- android_webview/renderer/aw_execution_termination_filter.cc \
android_webview/renderer/aw_key_systems.cc \
android_webview/renderer/aw_permission_client.cc \
android_webview/renderer/aw_render_process_observer.cc \
@@ -221,6 +219,7 @@
$(PWD)/external/icu/icu4c/source/i18n \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
+ $(LOCAL_PATH)/v8/include \
$(LOCAL_PATH)/third_party/libpng \
$(LOCAL_PATH)/third_party/zlib \
$(LOCAL_PATH)/third_party/libwebp \
@@ -228,7 +227,6 @@
$(LOCAL_PATH)/third_party/qcms/src \
$(LOCAL_PATH)/third_party/iccjpeg \
$(PWD)/external/jpeg \
- $(LOCAL_PATH)/v8/include \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
$(PWD)/frameworks/wilhelm/include \
@@ -379,6 +377,7 @@
$(PWD)/external/icu/icu4c/source/i18n \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
+ $(LOCAL_PATH)/v8/include \
$(LOCAL_PATH)/third_party/libpng \
$(LOCAL_PATH)/third_party/zlib \
$(LOCAL_PATH)/third_party/libwebp \
@@ -386,7 +385,6 @@
$(LOCAL_PATH)/third_party/qcms/src \
$(LOCAL_PATH)/third_party/iccjpeg \
$(PWD)/external/jpeg \
- $(LOCAL_PATH)/v8/include \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
$(PWD)/frameworks/wilhelm/include \
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 3f127e1..776aed5 100644
--- a/android_webview/android_webview_common.target.linux-x86_64.mk
+++ b/android_webview/android_webview_common.target.linux-x86_64.mk
@@ -16,7 +16,6 @@
$(call intermediates-dir-for,GYP,skia_skia_gyp,,,$(GYP_VAR_PREFIX))/skia.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp,,,$(GYP_VAR_PREFIX))/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp,,,$(GYP_VAR_PREFIX))/blink.stamp \
- $(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp,,,$(GYP_VAR_PREFIX))/v8.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp,,,$(GYP_VAR_PREFIX))/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,GYP,android_webview_android_webview_pak_gyp,,,$(GYP_VAR_PREFIX))/android_webview_pak.stamp
@@ -80,7 +79,6 @@
android_webview/lib/aw_browser_dependency_factory_impl.cc \
android_webview/lib/main/aw_main_delegate.cc \
android_webview/renderer/aw_content_renderer_client.cc \
- android_webview/renderer/aw_execution_termination_filter.cc \
android_webview/renderer/aw_key_systems.cc \
android_webview/renderer/aw_permission_client.cc \
android_webview/renderer/aw_render_process_observer.cc \
@@ -220,6 +218,7 @@
$(PWD)/external/icu/icu4c/source/i18n \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
+ $(LOCAL_PATH)/v8/include \
$(LOCAL_PATH)/third_party/libpng \
$(LOCAL_PATH)/third_party/zlib \
$(LOCAL_PATH)/third_party/libwebp \
@@ -227,7 +226,6 @@
$(LOCAL_PATH)/third_party/qcms/src \
$(LOCAL_PATH)/third_party/iccjpeg \
$(PWD)/external/jpeg \
- $(LOCAL_PATH)/v8/include \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
$(PWD)/frameworks/wilhelm/include \
@@ -377,6 +375,7 @@
$(PWD)/external/icu/icu4c/source/i18n \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
+ $(LOCAL_PATH)/v8/include \
$(LOCAL_PATH)/third_party/libpng \
$(LOCAL_PATH)/third_party/zlib \
$(LOCAL_PATH)/third_party/libwebp \
@@ -384,7 +383,6 @@
$(LOCAL_PATH)/third_party/qcms/src \
$(LOCAL_PATH)/third_party/iccjpeg \
$(PWD)/external/jpeg \
- $(LOCAL_PATH)/v8/include \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
$(PWD)/frameworks/wilhelm/include \
