summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authormichaelbai <michaelbai@chromium.org>2015-10-23 10:38:09 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-23 17:39:27 +0000
commita29b0f4817b9f3eea419c902951af0a8c979d519 (patch)
tree65f438c1e210ed77d689d01d459077babc2a3b02 /android_webview
parent22d6af72f6da6684dba6049fd0a521a1808a6355 (diff)
downloadchromium_src-a29b0f4817b9f3eea419c902951af0a8c979d519.zip
chromium_src-a29b0f4817b9f3eea419c902951af0a8c979d519.tar.gz
chromium_src-a29b0f4817b9f3eea419c902951af0a8c979d519.tar.bz2
GN WebView: add //android_webview/common target
BUG=532905 Review URL: https://codereview.chromium.org/1408933007 Cr-Commit-Position: refs/heads/master@{#355820}
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/BUILD.gn344
-rw-r--r--android_webview/android_webview.gyp4
-rw-r--r--android_webview/lib/main/aw_main_delegate.cc2
3 files changed, 350 insertions, 0 deletions
diff --git a/android_webview/BUILD.gn b/android_webview/BUILD.gn
index dcf89a8..0ea2bfb 100644
--- a/android_webview/BUILD.gn
+++ b/android_webview/BUILD.gn
@@ -4,6 +4,7 @@
import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
+import("//build_overrides/v8.gni")
import("//tools/grit/repack.gni")
# This is dummy target for adding WebView gn piece by piece, so we don't need
@@ -11,9 +12,352 @@ import("//tools/grit/repack.gni")
group("system_webview_apk") {
deps = [
":android_webview_java",
+ ":common",
":strings_grd",
+ ]
+}
+
+grit("generate_aw_resources") {
+ source = "ui/aw_resources.grd"
+ outputs = [
+ "grit/aw_resources.h",
+ "aw_resources.pak",
+ ]
+}
+
+grit("generate_aw_strings") {
+ source = "ui/aw_strings.grd"
+ outputs = [
+ "grit/aw_strings.h",
+ "aw_strings_am.pak",
+ "aw_strings_ar.pak",
+ "aw_strings_bg.pak",
+ "aw_strings_bn.pak",
+ "aw_strings_ca.pak",
+ "aw_strings_cs.pak",
+ "aw_strings_da.pak",
+ "aw_strings_de.pak",
+ "aw_strings_el.pak",
+ "aw_strings_en-US.pak",
+ "aw_strings_en-GB.pak",
+ "aw_strings_es.pak",
+ "aw_strings_es-419.pak",
+ "aw_strings_et.pak",
+ "aw_strings_fa.pak",
+ "aw_strings_fi.pak",
+ "aw_strings_fil.pak",
+ "aw_strings_fr.pak",
+ "aw_strings_gu.pak",
+ "aw_strings_he.pak",
+ "aw_strings_hi.pak",
+ "aw_strings_hr.pak",
+ "aw_strings_hu.pak",
+ "aw_strings_id.pak",
+ "aw_strings_it.pak",
+ "aw_strings_ja.pak",
+ "aw_strings_kn.pak",
+ "aw_strings_ko.pak",
+ "aw_strings_lt.pak",
+ "aw_strings_lv.pak",
+ "aw_strings_ml.pak",
+ "aw_strings_mr.pak",
+ "aw_strings_ms.pak",
+ "aw_strings_nl.pak",
+ "aw_strings_nb.pak",
+ "aw_strings_pl.pak",
+ "aw_strings_pt-BR.pak",
+ "aw_strings_pt-PT.pak",
+ "aw_strings_ro.pak",
+ "aw_strings_ru.pak",
+ "aw_strings_sk.pak",
+ "aw_strings_sl.pak",
+ "aw_strings_sr.pak",
+ "aw_strings_sv.pak",
+ "aw_strings_sw.pak",
+ "aw_strings_ta.pak",
+ "aw_strings_te.pak",
+ "aw_strings_th.pak",
+ "aw_strings_tr.pak",
+ "aw_strings_uk.pak",
+ "aw_strings_vi.pak",
+ "aw_strings_zh-CN.pak",
+ "aw_strings_zh-TW.pak",
+ ]
+}
+
+grit("generate_components_strings") {
+ source = "../components/components_strings.grd"
+
+ # components_strings contains strings from all components. WebView
+ # will never display most of them, so we try to limit the included
+ # strings
+ whitelist = rebase_path("ui/grit_components_whitelist.txt")
+ inputs = [
+ whitelist,
+ ]
+ grit_flags = [
+ "-w",
+ whitelist,
+ ]
+ outputs = [
+ "grit/components_strings.h",
+ "components_strings_am.pak",
+ "components_strings_ar.pak",
+ "components_strings_bg.pak",
+ "components_strings_bn.pak",
+ "components_strings_ca.pak",
+ "components_strings_cs.pak",
+ "components_strings_da.pak",
+ "components_strings_de.pak",
+ "components_strings_el.pak",
+ "components_strings_en-GB.pak",
+ "components_strings_en-US.pak",
+ "components_strings_es.pak",
+ "components_strings_es-419.pak",
+ "components_strings_et.pak",
+ "components_strings_fa.pak",
+ "components_strings_fake-bidi.pak",
+ "components_strings_fi.pak",
+ "components_strings_fil.pak",
+ "components_strings_fr.pak",
+ "components_strings_gu.pak",
+ "components_strings_he.pak",
+ "components_strings_hi.pak",
+ "components_strings_hr.pak",
+ "components_strings_hu.pak",
+ "components_strings_id.pak",
+ "components_strings_it.pak",
+ "components_strings_ja.pak",
+ "components_strings_kn.pak",
+ "components_strings_ko.pak",
+ "components_strings_lt.pak",
+ "components_strings_lv.pak",
+ "components_strings_ml.pak",
+ "components_strings_mr.pak",
+ "components_strings_ms.pak",
+ "components_strings_nl.pak",
+ "components_strings_nb.pak",
+ "components_strings_pl.pak",
+ "components_strings_pt-BR.pak",
+ "components_strings_pt-PT.pak",
+ "components_strings_ro.pak",
+ "components_strings_ru.pak",
+ "components_strings_sk.pak",
+ "components_strings_sl.pak",
+ "components_strings_sr.pak",
+ "components_strings_sv.pak",
+ "components_strings_sw.pak",
+ "components_strings_ta.pak",
+ "components_strings_te.pak",
+ "components_strings_th.pak",
+ "components_strings_tr.pak",
+ "components_strings_uk.pak",
+ "components_strings_vi.pak",
+ "components_strings_zh-CN.pak",
+ "components_strings_zh-TW.pak",
+ ]
+}
+
+source_set("common") {
+ sources = [
+ "browser/aw_browser_context.cc",
+ "browser/aw_browser_context.h",
+ "browser/aw_browser_main_parts.cc",
+ "browser/aw_browser_main_parts.h",
+ "browser/aw_browser_permission_request_delegate.h",
+ "browser/aw_browser_policy_connector.cc",
+ "browser/aw_browser_policy_connector.h",
+ "browser/aw_content_browser_client.cc",
+ "browser/aw_content_browser_client.h",
+ "browser/aw_contents_client_bridge_base.cc",
+ "browser/aw_contents_client_bridge_base.h",
+ "browser/aw_contents_io_thread_client.h",
+ "browser/aw_cookie_access_policy.cc",
+ "browser/aw_cookie_access_policy.h",
+ "browser/aw_dev_tools_discovery_provider.cc",
+ "browser/aw_dev_tools_discovery_provider.h",
+ "browser/aw_download_manager_delegate.cc",
+ "browser/aw_download_manager_delegate.h",
+ "browser/aw_form_database_service.cc",
+ "browser/aw_form_database_service.h",
+ "browser/aw_gl_surface.cc",
+ "browser/aw_gl_surface.h",
+ "browser/aw_http_auth_handler_base.cc",
+ "browser/aw_http_auth_handler_base.h",
+ "browser/aw_javascript_dialog_manager.cc",
+ "browser/aw_javascript_dialog_manager.h",
+ "browser/aw_locale_manager.h",
+ "browser/aw_login_delegate.cc",
+ "browser/aw_login_delegate.h",
+ "browser/aw_media_client_android.cc",
+ "browser/aw_media_client_android.h",
+ "browser/aw_message_port_message_filter.cc",
+ "browser/aw_message_port_message_filter.h",
+ "browser/aw_message_port_service.h",
+ "browser/aw_permission_manager.cc",
+ "browser/aw_permission_manager.h",
+ "browser/aw_pref_store.cc",
+ "browser/aw_pref_store.h",
+ "browser/aw_print_manager.cc",
+ "browser/aw_print_manager.h",
+ "browser/aw_printing_message_filter.cc",
+ "browser/aw_printing_message_filter.h",
+ "browser/aw_quota_manager_bridge.cc",
+ "browser/aw_quota_manager_bridge.h",
+ "browser/aw_quota_permission_context.cc",
+ "browser/aw_quota_permission_context.h",
+ "browser/aw_render_thread_context_provider.cc",
+ "browser/aw_render_thread_context_provider.h",
+ "browser/aw_resource_context.cc",
+ "browser/aw_resource_context.h",
+ "browser/aw_result_codes.h",
+ "browser/aw_ssl_host_state_delegate.cc",
+ "browser/aw_ssl_host_state_delegate.h",
+ "browser/aw_web_preferences_populater.cc",
+ "browser/aw_web_preferences_populater.h",
+ "browser/browser_view_renderer.cc",
+ "browser/browser_view_renderer.h",
+ "browser/browser_view_renderer_client.h",
+ "browser/child_frame.cc",
+ "browser/child_frame.h",
+ "browser/deferred_gpu_command_service.cc",
+ "browser/deferred_gpu_command_service.h",
+ "browser/find_helper.cc",
+ "browser/find_helper.h",
+ "browser/gl_view_renderer_manager.cc",
+ "browser/gl_view_renderer_manager.h",
+ "browser/hardware_renderer.cc",
+ "browser/hardware_renderer.h",
+ "browser/icon_helper.cc",
+ "browser/icon_helper.h",
+ "browser/input_stream.h",
+ "browser/jni_dependency_factory.h",
+ "browser/net/android_stream_reader_url_request_job.cc",
+ "browser/net/android_stream_reader_url_request_job.h",
+ "browser/net/aw_http_user_agent_settings.cc",
+ "browser/net/aw_http_user_agent_settings.h",
+ "browser/net/aw_network_delegate.cc",
+ "browser/net/aw_network_delegate.h",
+ "browser/net/aw_request_interceptor.cc",
+ "browser/net/aw_request_interceptor.h",
+ "browser/net/aw_url_request_context_getter.cc",
+ "browser/net/aw_url_request_context_getter.h",
+ "browser/net/aw_url_request_job_factory.cc",
+ "browser/net/aw_url_request_job_factory.h",
+ "browser/net/aw_web_resource_response.h",
+ "browser/net/init_native_callback.h",
+ "browser/net/input_stream_reader.cc",
+ "browser/net/input_stream_reader.h",
+ "browser/net_disk_cache_remover.cc",
+ "browser/net_disk_cache_remover.h",
+ "browser/parent_compositor_draw_constraints.cc",
+ "browser/parent_compositor_draw_constraints.h",
+ "browser/parent_output_surface.cc",
+ "browser/parent_output_surface.h",
+ "browser/renderer_host/aw_render_view_host_ext.cc",
+ "browser/renderer_host/aw_render_view_host_ext.h",
+ "browser/renderer_host/aw_resource_dispatcher_host_delegate.cc",
+ "browser/renderer_host/aw_resource_dispatcher_host_delegate.h",
+ "browser/scoped_allow_wait_for_legacy_web_view_api.h",
+ "browser/scoped_app_gl_state_restore.cc",
+ "browser/scoped_app_gl_state_restore.h",
+ "browser/shared_renderer_state.cc",
+ "browser/shared_renderer_state.h",
+ "common/android_webview_message_generator.cc",
+ "common/android_webview_message_generator.h",
+ "common/aw_content_client.cc",
+ "common/aw_content_client.h",
+ "common/aw_descriptors.h",
+ "common/aw_hit_test_data.cc",
+ "common/aw_hit_test_data.h",
+ "common/aw_message_port_messages.h",
+ "common/aw_resource.h",
+ "common/aw_switches.cc",
+ "common/aw_switches.h",
+ "common/devtools_instrumentation.h",
+ "common/render_view_messages.cc",
+ "common/render_view_messages.h",
+ "common/url_constants.cc",
+ "common/url_constants.h",
+ "crash_reporter/aw_microdump_crash_reporter.cc",
+ "crash_reporter/aw_microdump_crash_reporter.h",
+ "lib/aw_browser_dependency_factory_impl.cc",
+ "lib/aw_browser_dependency_factory_impl.h",
+ "lib/main/aw_main_delegate.cc",
+ "lib/main/aw_main_delegate.h",
+ "lib/main/webview_jni_onload.cc",
+ "lib/main/webview_jni_onload.h",
+ "public/browser/draw_gl.h",
+ "renderer/aw_content_renderer_client.cc",
+ "renderer/aw_content_renderer_client.h",
+ "renderer/aw_content_settings_client.cc",
+ "renderer/aw_content_settings_client.h",
+ "renderer/aw_key_systems.cc",
+ "renderer/aw_key_systems.h",
+ "renderer/aw_message_port_client.cc",
+ "renderer/aw_message_port_client.h",
+ "renderer/aw_print_web_view_helper_delegate.cc",
+ "renderer/aw_print_web_view_helper_delegate.h",
+ "renderer/aw_render_frame_ext.cc",
+ "renderer/aw_render_frame_ext.h",
+ "renderer/aw_render_process_observer.cc",
+ "renderer/aw_render_process_observer.h",
+ "renderer/aw_render_view_ext.cc",
+ "renderer/aw_render_view_ext.h",
+ "renderer/print_render_frame_observer.cc",
+ "renderer/print_render_frame_observer.h",
+ ]
+
+ deps = [
+ ":generate_aw_resources",
+ ":generate_aw_strings",
+ ":generate_components_strings",
"//android_webview/native:native",
+ "//cc/surfaces",
+ "//components/auto_login_parser:auto_login_parser",
+ "//components/autofill/content/renderer",
+ "//components/crash/content/app",
+ "//components/crash/content/browser",
+ "//components/cdm/browser",
+ "//components/cdm/renderer",
+ "//components/data_reduction_proxy/core/browser",
+ "//components/devtools_discovery",
+ "//components/navigation_interception",
+ "//components/printing/common",
+ "//components/printing/browser",
+ "//components/printing/renderer",
+ "//components/visitedlink/browser",
+ "//components/visitedlink/renderer",
+ "//components/web_contents_delegate_android:web_contents_delegate_android",
+ "//content/public/app:both",
+ "//content/public/browser",
+ "//gin",
+ "//gpu/blink",
+ "//gpu/command_buffer/common:gles2_utils",
+ "//gpu/command_buffer/service",
+ "//gpu/command_buffer/client:gl_in_process_context",
+ "//gpu/command_buffer/client:gles2_c_lib",
+ "//gpu/command_buffer/client:gles2_implementation",
+ "//gpu/skia_bindings",
+ "//media",
+ "//media/midi",
+ "//printing",
+ "//skia",
+ "//third_party/WebKit/public:blink",
+ "//ui/events:gesture_detection",
+ "//ui/gl",
+ "//ui/shell_dialogs",
+ "//v8",
]
+
+ if (enable_configuration_policy) {
+ deps += [
+ "//components/policy",
+ "//components/policy:policy_component",
+ ]
+ }
+
+ configs += [ "//v8:external_startup_data" ]
}
android_library("android_webview_java") {
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 1a1dc7b..281c45f 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -28,6 +28,7 @@
'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/android_webview',
},
'actions': [
+ # GN version: //android_webview:generate_aw_resources
{
'action_name': 'generate_aw_resources',
'variables': {
@@ -51,6 +52,7 @@
},
'includes': [ '../build/repack_action.gypi' ],
},
+ # GN version: //android_webview:generate_aw_strings
{
'action_name': 'generate_aw_strings',
'variables': {
@@ -58,6 +60,7 @@
},
'includes': [ '../build/grit_action.gypi' ],
},
+ # GN version: //android_webview:generate_components_strings
{
'action_name': 'generate_components_strings',
'variables': {
@@ -188,6 +191,7 @@
},
],
},
+ # GN version: //android_webview:common
{
'target_name': 'android_webview_common',
'type': 'static_library',
diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc
index 8fe08c7..e2f7fc1 100644
--- a/android_webview/lib/main/aw_main_delegate.cc
+++ b/android_webview/lib/main/aw_main_delegate.cc
@@ -89,7 +89,9 @@ bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
cl->AppendSwitch(switches::kDisableNotifications);
// WebRTC hardware decoding is not supported, internal bug 15075307
+#if defined(ENABLE_WEBRTC)
cl->AppendSwitch(switches::kDisableWebRtcHWDecoding);
+#endif
cl->AppendSwitch(switches::kDisableAcceleratedVideoDecode);
// This is needed for sharing textures across the different GL threads.