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

Unified Diff: ios/web/ios_web.gyp

Issue 1049703004: Upstream web js bundle. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added compile_javascript variable to js_compile.gypi. Created 5 years, 9 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 | « no previous file | ios/web/js_compile.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/ios_web.gyp
diff --git a/ios/web/ios_web.gyp b/ios/web/ios_web.gyp
index 137f2c5ff1b8d5ef4cd4f8acbc03a1479a655fea..478fd7fe7641603ee1775e18211c8488993583f6 100644
--- a/ios/web/ios_web.gyp
+++ b/ios/web/ios_web.gyp
@@ -15,6 +15,7 @@
],
'dependencies': [
'ios_web_core',
+ 'js_resources',
'user_agent',
'../../base/base.gyp:base',
'../../content/content.gyp:content_browser',
@@ -148,22 +149,80 @@
],
},
{
+ 'target_name': 'ios_web_js_bundle_ui',
+ 'type': 'none',
+ 'variables': {
+ 'closure_entry_point': '__crWeb.webBundle',
+ 'js_bundle_files': [
+ 'web_state/js/resources/base.js',
+ 'web_state/js/resources/common.js',
+ 'web_state/js/resources/console.js',
+ 'web_state/js/resources/core.js',
+ 'web_state/js/resources/core_dynamic_ui.js',
+ 'web_state/js/resources/dialog_overrides.js',
+ 'web_state/js/resources/message.js',
+ 'web_state/js/resources/message_dynamic_ui.js',
+ 'web_state/js/resources/web_bundle_ui.js',
+ 'web_state/js/resources/window_open_ui.js',
+ ],
+ },
+ 'sources': [
+ 'web_state/js/resources/web_bundle_ui.js',
+ ],
+ 'link_settings': {
+ 'mac_bundle_resources': [
+ '<(SHARED_INTERMEDIATE_DIR)/web_bundle_ui.js',
+ ],
+ },
+ 'includes': [
+ 'js_compile_bundle.gypi'
+ ],
+ },
+ {
+ 'target_name': 'ios_web_js_bundle_wk',
+ 'type': 'none',
+ 'variables': {
+ 'closure_entry_point': '__crWeb.webBundle',
+ 'js_bundle_files': [
+ 'web_state/js/resources/base.js',
+ 'web_state/js/resources/common.js',
+ 'web_state/js/resources/console.js',
+ 'web_state/js/resources/core.js',
+ 'web_state/js/resources/core_dynamic_wk.js',
+ 'web_state/js/resources/dialog_overrides.js',
+ 'web_state/js/resources/message.js',
+ 'web_state/js/resources/message_dynamic_wk.js',
+ 'web_state/js/resources/web_bundle_wk.js',
+ 'web_state/js/resources/window_open_wk.js',
+ ],
+ },
+ 'sources': [
+ 'web_state/js/resources/web_bundle_wk.js',
+ ],
+ 'link_settings': {
+ 'mac_bundle_resources': [
+ '<(SHARED_INTERMEDIATE_DIR)/web_bundle_wk.js',
+ ],
+ },
+ 'includes': [
+ 'js_compile_bundle.gypi'
+ ],
+ },
+ {
'target_name': 'js_resources',
'type': 'none',
+ 'dependencies': [
+ 'ios_web_js_bundle_ui',
+ 'ios_web_js_bundle_wk',
+ ],
'sources': [
- 'web_state/js/resources/base.js',
- 'web_state/js/resources/common.js',
- 'web_state/js/resources/message.js',
- 'web_state/js/resources/message_dynamic_ui.js',
- 'web_state/js/resources/message_dynamic_wk.js',
+ 'web_state/js/resources/plugin_placeholder.js',
+ 'web_state/js/resources/window_id.js',
],
'link_settings': {
'mac_bundle_resources': [
- '<(SHARED_INTERMEDIATE_DIR)/base.js',
- '<(SHARED_INTERMEDIATE_DIR)/common.js',
- '<(SHARED_INTERMEDIATE_DIR)/message.js',
- '<(SHARED_INTERMEDIATE_DIR)/message_dynamic_ui.js',
- '<(SHARED_INTERMEDIATE_DIR)/message_dynamic_wk.js',
+ '<(SHARED_INTERMEDIATE_DIR)/plugin_placeholder.js',
+ '<(SHARED_INTERMEDIATE_DIR)/window_id.js',
],
},
'includes': [
« no previous file with comments | « no previous file | ios/web/js_compile.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698