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

Side by Side Diff: android_webview/android_webview.gyp

Issue 1423713015: [WIP] WebRestrictions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 11 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
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 'system_webview_package_name%': 'com.android.webview', 7 'system_webview_package_name%': 'com.android.webview',
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 '../components/components.gyp:metrics_net', 236 '../components/components.gyp:metrics_net',
237 '../components/components.gyp:metrics_profiler', 237 '../components/components.gyp:metrics_profiler',
238 '../components/components.gyp:metrics_ui', 238 '../components/components.gyp:metrics_ui',
239 '../components/components.gyp:navigation_interception', 239 '../components/components.gyp:navigation_interception',
240 '../components/components.gyp:printing_common', 240 '../components/components.gyp:printing_common',
241 '../components/components.gyp:printing_browser', 241 '../components/components.gyp:printing_browser',
242 '../components/components.gyp:printing_renderer', 242 '../components/components.gyp:printing_renderer',
243 '../components/components.gyp:visitedlink_browser', 243 '../components/components.gyp:visitedlink_browser',
244 '../components/components.gyp:visitedlink_renderer', 244 '../components/components.gyp:visitedlink_renderer',
245 '../components/components.gyp:web_contents_delegate_android', 245 '../components/components.gyp:web_contents_delegate_android',
246 '../components/components.gyp:web_restriction',
Bernhard Bauer 2016/01/22 17:32:31 I think using the plural would be a bit more idiom
knn 2016/01/25 11:54:24 In that case we should rename the component as wel
Bernhard Bauer 2016/01/26 09:52:41 Yes, I would call the component "web_restrictions"
246 '../content/content.gyp:content_app_both', 247 '../content/content.gyp:content_app_both',
247 '../content/content.gyp:content_browser', 248 '../content/content.gyp:content_browser',
248 '../gin/gin.gyp:gin', 249 '../gin/gin.gyp:gin',
249 '../gpu/blink/gpu_blink.gyp:gpu_blink', 250 '../gpu/blink/gpu_blink.gyp:gpu_blink',
250 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', 251 '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
251 '../gpu/gpu.gyp:command_buffer_service', 252 '../gpu/gpu.gyp:command_buffer_service',
252 '../gpu/gpu.gyp:gl_in_process_context', 253 '../gpu/gpu.gyp:gl_in_process_context',
253 '../gpu/gpu.gyp:gles2_c_lib', 254 '../gpu/gpu.gyp:gles2_c_lib',
254 '../gpu/gpu.gyp:gles2_implementation', 255 '../gpu/gpu.gyp:gles2_implementation',
255 '../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings', 256 '../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings',
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 }, 441 },
441 { 442 {
442 # GN version: //android_webview:android_webview_java 443 # GN version: //android_webview:android_webview_java
443 'target_name': 'android_webview_java', 444 'target_name': 'android_webview_java',
444 'type': 'none', 445 'type': 'none',
445 'dependencies': [ 446 'dependencies': [
446 '../android_webview/native/webview_native.gyp:android_webview_aw_permiss ion_request_resource', 447 '../android_webview/native/webview_native.gyp:android_webview_aw_permiss ion_request_resource',
447 '../components/components.gyp:external_video_surface_java', 448 '../components/components.gyp:external_video_surface_java',
448 '../components/components.gyp:navigation_interception_java', 449 '../components/components.gyp:navigation_interception_java',
449 '../components/components.gyp:web_contents_delegate_android_java', 450 '../components/components.gyp:web_contents_delegate_android_java',
451 '../components/components.gyp:web_restriction_java',
450 '../content/content.gyp:content_java', 452 '../content/content.gyp:content_java',
451 '../ui/android/ui_android.gyp:ui_java', 453 '../ui/android/ui_android.gyp:ui_java',
452 'android_webview_locale_paks', 454 'android_webview_locale_paks',
453 'android_webview_strings_grd', 455 'android_webview_strings_grd',
454 ], 456 ],
455 'variables': { 457 'variables': {
456 'java_in_dir': '../android_webview/java', 458 'java_in_dir': '../android_webview/java',
457 'has_java_resources': 1, 459 'has_java_resources': 1,
458 'R_package': 'org.chromium.android_webview', 460 'R_package': 'org.chromium.android_webview',
459 'R_package_relpath': 'org/chromium/android_webview', 461 'R_package_relpath': 'org/chromium/android_webview',
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 'includes': [ 'apk/system_webview_apk_common.gypi' ], 499 'includes': [ 'apk/system_webview_apk_common.gypi' ],
498 }, 500 },
499 ], 501 ],
500 }] 502 }]
501 ], 503 ],
502 'includes': [ 504 'includes': [
503 'android_webview_tests.gypi', 505 'android_webview_tests.gypi',
504 'apk/system_webview_paks.gypi', 506 'apk/system_webview_paks.gypi',
505 ], 507 ],
506 } 508 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698