Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1626)

Unified Diff: android_webview/android_webview.gyp

Issue 1890203002: Implement Web Restrictions in WebView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix final nits Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/DEPS ('k') | android_webview/browser/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/android_webview.gyp
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 50fdf10b19feccc65c4c6b2eb171967325129ba6..a829f51985a86b4e704d5331925f28daa37bb957 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -11,6 +11,7 @@
'target_name': 'android_webview_pak',
'type': 'none',
'dependencies': [
+ '<(DEPTH)/components/components_resources.gyp:components_resources',
'<(DEPTH)/content/app/resources/content_resources.gyp:content_resources',
'<(DEPTH)/net/net.gyp:net_resources',
'<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources',
@@ -44,9 +45,11 @@
'<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_image_resources_100_percent.pak',
'<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
'<(grit_out_dir)/aw_resources.pak',
],
'pak_output': '<(webview_chromium_pak_path)',
@@ -239,9 +242,12 @@
'../components/components.gyp:printing_common',
'../components/components.gyp:printing_browser',
'../components/components.gyp:printing_renderer',
+ '../components/components.gyp:supervised_user_error_page',
+ '../components/components.gyp:supervised_user_error_page_gin',
'../components/components.gyp:visitedlink_browser',
'../components/components.gyp:visitedlink_renderer',
'../components/components.gyp:web_contents_delegate_android',
+ '../components/components.gyp:web_restrictions_browser',
'../content/content.gyp:content_app_both',
'../content/content.gyp:content_browser',
'../gin/gin.gyp:gin',
@@ -458,6 +464,7 @@
'../components/components.gyp:external_video_surface_java',
'../components/components.gyp:navigation_interception_java',
'../components/components.gyp:web_contents_delegate_android_java',
+ '../components/components.gyp:web_restrictions_java_browser',
'../content/content.gyp:content_java',
'../ui/android/ui_android.gyp:ui_java',
'android_webview_locale_paks',
« no previous file with comments | « android_webview/DEPS ('k') | android_webview/browser/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698