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

Side by Side Diff: android_webview/android_webview.gyp

Issue 536593004: Revert "Merge 281715 "[Android WebView] Terminate execution of stuck JS ..."" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2062
Patch Set: Created 6 years, 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | android_webview/browser/renderer_host/aw_render_view_host_ext.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2009 The Chromium Authors. All rights reserved. 1 # Copyright 2009 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 }, 7 },
8 'targets': [ 8 'targets': [
9 { 9 {
10 'target_name': 'libwebviewchromium', 10 'target_name': 'libwebviewchromium',
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 '../components/components.gyp:web_contents_delegate_android', 100 '../components/components.gyp:web_contents_delegate_android',
101 '../content/content.gyp:content_app_both', 101 '../content/content.gyp:content_app_both',
102 '../content/content.gyp:content_browser', 102 '../content/content.gyp:content_browser',
103 '../gpu/gpu.gyp:command_buffer_service', 103 '../gpu/gpu.gyp:command_buffer_service',
104 '../gpu/gpu.gyp:gles2_implementation', 104 '../gpu/gpu.gyp:gles2_implementation',
105 '../gpu/gpu.gyp:gl_in_process_context', 105 '../gpu/gpu.gyp:gl_in_process_context',
106 '../media/media.gyp:media', 106 '../media/media.gyp:media',
107 '../printing/printing.gyp:printing', 107 '../printing/printing.gyp:printing',
108 '../skia/skia.gyp:skia', 108 '../skia/skia.gyp:skia',
109 '../third_party/WebKit/public/blink.gyp:blink', 109 '../third_party/WebKit/public/blink.gyp:blink',
110 '../v8/tools/gyp/v8.gyp:v8',
111 '../ui/gl/gl.gyp:gl', 110 '../ui/gl/gl.gyp:gl',
112 '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs', 111 '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
113 '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', 112 '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
114 'android_webview_pak', 113 'android_webview_pak',
115 ], 114 ],
116 'include_dirs': [ 115 'include_dirs': [
117 '..', 116 '..',
118 '../skia/config', 117 '../skia/config',
119 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/', 118 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/',
120 ], 119 ],
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 'common/render_view_messages.h', 219 'common/render_view_messages.h',
221 'common/url_constants.cc', 220 'common/url_constants.cc',
222 'common/url_constants.h', 221 'common/url_constants.h',
223 'lib/aw_browser_dependency_factory_impl.cc', 222 'lib/aw_browser_dependency_factory_impl.cc',
224 'lib/aw_browser_dependency_factory_impl.h', 223 'lib/aw_browser_dependency_factory_impl.h',
225 'lib/main/aw_main_delegate.cc', 224 'lib/main/aw_main_delegate.cc',
226 'lib/main/aw_main_delegate.h', 225 'lib/main/aw_main_delegate.h',
227 'public/browser/draw_gl.h', 226 'public/browser/draw_gl.h',
228 'renderer/aw_content_renderer_client.cc', 227 'renderer/aw_content_renderer_client.cc',
229 'renderer/aw_content_renderer_client.h', 228 'renderer/aw_content_renderer_client.h',
230 'renderer/aw_execution_termination_filter.cc',
231 'renderer/aw_execution_termination_filter.h',
232 'renderer/aw_key_systems.cc', 229 'renderer/aw_key_systems.cc',
233 'renderer/aw_key_systems.h', 230 'renderer/aw_key_systems.h',
234 'renderer/aw_permission_client.cc', 231 'renderer/aw_permission_client.cc',
235 'renderer/aw_permission_client.h', 232 'renderer/aw_permission_client.h',
236 'renderer/aw_render_process_observer.cc', 233 'renderer/aw_render_process_observer.cc',
237 'renderer/aw_render_process_observer.h', 234 'renderer/aw_render_process_observer.h',
238 'renderer/aw_render_frame_ext.cc', 235 'renderer/aw_render_frame_ext.cc',
239 'renderer/aw_render_frame_ext.h', 236 'renderer/aw_render_frame_ext.h',
240 'renderer/aw_render_view_ext.cc', 237 'renderer/aw_render_view_ext.cc',
241 'renderer/aw_render_view_ext.h', 238 'renderer/aw_render_view_ext.h',
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 '../content/content.gyp:content_strings_grd', 296 '../content/content.gyp:content_strings_grd',
300 '../ui/android/ui_android.gyp:ui_strings_grd', 297 '../ui/android/ui_android.gyp:ui_strings_grd',
301 'android_webview_jarjar_ui_resources', 298 'android_webview_jarjar_ui_resources',
302 'android_webview_jarjar_content_resources' 299 'android_webview_jarjar_content_resources'
303 ], 300 ],
304 }, 301 },
305 ], 302 ],
306 }], 303 }],
307 ], 304 ],
308 } 305 }
OLDNEW
« no previous file with comments | « no previous file | android_webview/browser/renderer_host/aw_render_view_host_ext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698