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

Side by Side 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: Respond to comments, and fix a possible race in displaying error page Created 4 years, 7 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 {
11 'target_name': 'android_webview_pak', 11 'target_name': 'android_webview_pak',
12 'type': 'none', 12 'type': 'none',
13 'dependencies': [ 13 'dependencies': [
14 '<(DEPTH)/components/components_resources.gyp:components_resources',
14 '<(DEPTH)/content/app/resources/content_resources.gyp:content_resources' , 15 '<(DEPTH)/content/app/resources/content_resources.gyp:content_resources' ,
15 '<(DEPTH)/net/net.gyp:net_resources', 16 '<(DEPTH)/net/net.gyp:net_resources',
16 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources' , 17 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources' ,
17 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', 18 '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
18 ], 19 ],
19 'variables': { 20 'variables': {
20 'conditions': [ 21 'conditions': [
21 ['target_arch=="arm" or target_arch=="ia32" or target_arch=="mipsel"', { 22 ['target_arch=="arm" or target_arch=="ia32" or target_arch=="mipsel"', {
22 'arch_suffix':'32' 23 'arch_suffix':'32'
23 }], 24 }],
(...skipping 13 matching lines...) Expand all
37 'includes': [ '../build/grit_action.gypi' ], 38 'includes': [ '../build/grit_action.gypi' ],
38 }, 39 },
39 # GN version: //android_webview:repack_pack 40 # GN version: //android_webview:repack_pack
40 { 41 {
41 'action_name': 'repack_android_webview_pack', 42 'action_name': 'repack_android_webview_pack',
42 'variables': { 43 'variables': {
43 'pak_inputs': [ 44 'pak_inputs': [
44 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources .pak', 45 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources .pak',
45 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_image_res ources_100_percent.pak', 46 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_image_res ources_100_percent.pak',
46 '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resource s_100_percent.pak', 47 '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resource s_100_percent.pak',
48 '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pak',
47 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', 49 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
48 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', 50 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
49 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent. pak', 51 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent. pak',
52 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
50 '<(grit_out_dir)/aw_resources.pak', 53 '<(grit_out_dir)/aw_resources.pak',
51 ], 54 ],
52 'pak_output': '<(webview_chromium_pak_path)', 55 'pak_output': '<(webview_chromium_pak_path)',
53 }, 56 },
54 'includes': [ '../build/repack_action.gypi' ], 57 'includes': [ '../build/repack_action.gypi' ],
55 }, 58 },
56 # GN version: //android_webview:generate_aw_strings 59 # GN version: //android_webview:generate_aw_strings
57 { 60 {
58 'action_name': 'generate_aw_strings', 61 'action_name': 'generate_aw_strings',
59 'variables': { 62 'variables': {
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 '../components/components.gyp:devtools_discovery', 236 '../components/components.gyp:devtools_discovery',
234 '../components/components.gyp:metrics', 237 '../components/components.gyp:metrics',
235 '../components/components.gyp:metrics_gpu', 238 '../components/components.gyp:metrics_gpu',
236 '../components/components.gyp:metrics_net', 239 '../components/components.gyp:metrics_net',
237 '../components/components.gyp:metrics_profiler', 240 '../components/components.gyp:metrics_profiler',
238 '../components/components.gyp:metrics_ui', 241 '../components/components.gyp:metrics_ui',
239 '../components/components.gyp:navigation_interception', 242 '../components/components.gyp:navigation_interception',
240 '../components/components.gyp:printing_common', 243 '../components/components.gyp:printing_common',
241 '../components/components.gyp:printing_browser', 244 '../components/components.gyp:printing_browser',
242 '../components/components.gyp:printing_renderer', 245 '../components/components.gyp:printing_renderer',
246 '../components/components.gyp:supervised_user_error_page',
247 '../components/components.gyp:supervised_user_error_page_gin',
243 '../components/components.gyp:visitedlink_browser', 248 '../components/components.gyp:visitedlink_browser',
244 '../components/components.gyp:visitedlink_renderer', 249 '../components/components.gyp:visitedlink_renderer',
245 '../components/components.gyp:web_contents_delegate_android', 250 '../components/components.gyp:web_contents_delegate_android',
251 '../components/components.gyp:web_restrictions_browser',
246 '../content/content.gyp:content_app_both', 252 '../content/content.gyp:content_app_both',
247 '../content/content.gyp:content_browser', 253 '../content/content.gyp:content_browser',
248 '../gin/gin.gyp:gin', 254 '../gin/gin.gyp:gin',
249 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', 255 '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
250 '../gpu/gpu.gyp:command_buffer_service', 256 '../gpu/gpu.gyp:command_buffer_service',
251 '../gpu/gpu.gyp:gl_in_process_context', 257 '../gpu/gpu.gyp:gl_in_process_context',
252 '../gpu/gpu.gyp:gles2_c_lib', 258 '../gpu/gpu.gyp:gles2_c_lib',
253 '../gpu/gpu.gyp:gles2_implementation', 259 '../gpu/gpu.gyp:gles2_implementation',
254 '../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings', 260 '../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings',
255 '../media/media.gyp:media', 261 '../media/media.gyp:media',
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 }, 456 },
451 { 457 {
452 # GN version: //android_webview:android_webview_java 458 # GN version: //android_webview:android_webview_java
453 'target_name': 'android_webview_java', 459 'target_name': 'android_webview_java',
454 'type': 'none', 460 'type': 'none',
455 'dependencies': [ 461 'dependencies': [
456 '../android_webview/native/webview_native.gyp:android_webview_aw_permiss ion_request_resource', 462 '../android_webview/native/webview_native.gyp:android_webview_aw_permiss ion_request_resource',
457 '../components/components.gyp:external_video_surface_java', 463 '../components/components.gyp:external_video_surface_java',
458 '../components/components.gyp:navigation_interception_java', 464 '../components/components.gyp:navigation_interception_java',
459 '../components/components.gyp:web_contents_delegate_android_java', 465 '../components/components.gyp:web_contents_delegate_android_java',
466 '../components/components.gyp:web_restrictions_java_browser',
460 '../content/content.gyp:content_java', 467 '../content/content.gyp:content_java',
461 '../ui/android/ui_android.gyp:ui_java', 468 '../ui/android/ui_android.gyp:ui_java',
462 'android_webview_locale_paks', 469 'android_webview_locale_paks',
463 'android_webview_strings_grd', 470 'android_webview_strings_grd',
464 ], 471 ],
465 'variables': { 472 'variables': {
466 'java_in_dir': '../android_webview/java', 473 'java_in_dir': '../android_webview/java',
467 'has_java_resources': 1, 474 'has_java_resources': 1,
468 'R_package': 'org.chromium.android_webview', 475 'R_package': 'org.chromium.android_webview',
469 'R_package_relpath': 'org/chromium/android_webview', 476 'R_package_relpath': 'org/chromium/android_webview',
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 'includes': [ 'apk/system_webview_apk_common.gypi' ], 515 'includes': [ 'apk/system_webview_apk_common.gypi' ],
509 }, 516 },
510 ], 517 ],
511 }] 518 }]
512 ], 519 ],
513 'includes': [ 520 'includes': [
514 'android_webview_tests.gypi', 521 'android_webview_tests.gypi',
515 'apk/system_webview_paks.gypi', 522 'apk/system_webview_paks.gypi',
516 ], 523 ],
517 } 524 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698