summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/blink/renderer/modules/BUILD.gn
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-05-24 11:40:17 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-05-24 12:42:11 +0000
commit5d87695f37678f96492b258bbab36486c59866b4 (patch)
treebe9783bbaf04fb930c4d74ca9c00b5e7954c8bc6 /chromium/third_party/blink/renderer/modules/BUILD.gn
parent6c11fb357ec39bf087b8b632e2b1e375aef1b38b (diff)
BASELINE: Update Chromium to 75.0.3770.56
Change-Id: I86d2007fd27a45d5797eee06f4c9369b8b50ac4f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/modules/BUILD.gn')
-rw-r--r--chromium/third_party/blink/renderer/modules/BUILD.gn59
1 files changed, 49 insertions, 10 deletions
diff --git a/chromium/third_party/blink/renderer/modules/BUILD.gn b/chromium/third_party/blink/renderer/modules/BUILD.gn
index efa8a76d7cf..eb6f43aa81f 100644
--- a/chromium/third_party/blink/renderer/modules/BUILD.gn
+++ b/chromium/third_party/blink/renderer/modules/BUILD.gn
@@ -11,6 +11,10 @@ import("//third_party/blink/renderer/build/scripts/scripts.gni")
import("//third_party/blink/renderer/modules/modules.gni")
import("//third_party/blink/renderer/modules/modules_idl_files.gni")
+if (is_android) {
+ import("//build/config/android/rules.gni")
+}
+
visibility = [ "//third_party/blink/renderer/*" ]
if (!is_component_build && is_win) {
@@ -27,6 +31,10 @@ config("modules_implementation") {
defines = [ "BLINK_MODULES_IMPLEMENTATION=1" ]
}
+config("notouch_config") {
+ defines = [ "TOUCHLESS_MEDIA_CONTROLS" ]
+}
+
make_names("module_names") {
in_files = [ "indexeddb/indexed_db_names.json5" ]
output_dir = blink_modules_output_dir
@@ -73,14 +81,7 @@ target("jumbo_" + modules_target_type, "modules") {
"//tools/v8_context_snapshot:use_v8_context_snapshot",
]
- deps = [
- ":make_modules_generated",
- ":module_names",
- "//net:net",
- "//third_party/blink/renderer/bindings/modules:generated",
- "//third_party/blink/renderer/bindings/modules/v8:bindings_modules_impl",
- "//third_party/blink/renderer/bindings/modules/v8:bindings_modules_origin_trial_features",
- "//third_party/blink/renderer/core",
+ sub_modules = [
"//third_party/blink/renderer/modules/accessibility",
"//third_party/blink/renderer/modules/animationworklet",
"//third_party/blink/renderer/modules/app_banner",
@@ -141,7 +142,6 @@ target("jumbo_" + modules_target_type, "modules") {
"//third_party/blink/renderer/modules/remoteplayback",
"//third_party/blink/renderer/modules/screen_orientation",
"//third_party/blink/renderer/modules/sensor",
- "//third_party/blink/renderer/modules/serial",
"//third_party/blink/renderer/modules/service_worker",
"//third_party/blink/renderer/modules/shapedetection",
"//third_party/blink/renderer/modules/speech",
@@ -161,6 +161,16 @@ target("jumbo_" + modules_target_type, "modules") {
"//third_party/blink/renderer/modules/webusb",
"//third_party/blink/renderer/modules/worklet",
"//third_party/blink/renderer/modules/xr",
+ ]
+
+ deps = [
+ ":make_modules_generated",
+ ":module_names",
+ "//net:net",
+ "//third_party/blink/renderer/bindings/modules:generated",
+ "//third_party/blink/renderer/bindings/modules/v8:bindings_modules_impl",
+ "//third_party/blink/renderer/bindings/modules/v8:bindings_modules_origin_trial_features",
+ "//third_party/blink/renderer/core",
"//third_party/icu",
"//third_party/webrtc/pc:libjingle_peerconnection",
"//third_party/webrtc/rtc_base:rtc_base",
@@ -168,12 +178,23 @@ target("jumbo_" + modules_target_type, "modules") {
"//third_party/zlib",
]
+ public_deps = sub_modules
+ allow_circular_includes_from = sub_modules
+
+ if (!is_android) {
+ deps += [ "//third_party/blink/renderer/modules/serial" ]
+ }
+
if (is_win) {
cflags = [ "/wd4334" ] # Result of 32-bit shift implicitly converted to 64 bits.
}
configs -= [ "//build/config/compiler:default_symbols" ]
configs += blink_symbols_config
+
+ if (is_android && notouch_build) {
+ configs += [ ":notouch_config" ]
+ }
}
jumbo_source_set("modules_testing") {
@@ -258,6 +279,7 @@ jumbo_source_set("unit_tests") {
"credentialmanager/password_credential_test.cc",
"csspaint/paint_rendering_context_2d_test.cc",
"csspaint/paint_worklet_global_scope_test.cc",
+ "csspaint/paint_worklet_proxy_client_test.cc",
"csspaint/paint_worklet_test.cc",
"device_orientation/device_motion_event_pump_unittest.cc",
"device_orientation/device_orientation_event_pump_unittest.cc",
@@ -278,9 +300,12 @@ jumbo_source_set("unit_tests") {
"indexeddb/mock_web_idb_database.h",
"indexeddb/mock_web_idb_factory.cc",
"indexeddb/mock_web_idb_factory.h",
+ "indexeddb/mock_web_idb_transaction.cc",
+ "indexeddb/mock_web_idb_transaction.h",
"indexeddb/web_idb_cursor_impl_unittest.cc",
- "indexeddb/web_idb_database_impl_unittest.cc",
+ "indexeddb/web_idb_transaction_impl_unittest.cc",
"manifest/image_resource_type_converters_test.cc",
+ "manifest/manifest_parser_unittest.cc",
"media_controls/elements/media_control_animated_arrow_container_element_test.cc",
"media_controls/elements/media_control_display_cutout_fullscreen_button_element_test.cc",
"media_controls/elements/media_control_input_element_test.cc",
@@ -295,6 +320,10 @@ jumbo_source_set("unit_tests") {
"media_controls/media_controls_rotate_to_fullscreen_delegate_test.cc",
"mediastream/media_constraints_test.cc",
"mediastream/media_devices_test.cc",
+ "mediastream/media_stream_video_capturer_source_test.cc",
+ "mediastream/mock_mojo_media_stream_dispatcher_host.cc",
+ "mediastream/mock_mojo_media_stream_dispatcher_host.h",
+ "mediastream/video_track_adapter_unittest.cc",
"notifications/notification_data_test.cc",
"notifications/notification_image_loader_test.cc",
"notifications/notification_resources_loader_test.cc",
@@ -324,6 +353,7 @@ jumbo_source_set("unit_tests") {
"peerconnection/rtc_quic_stream_test.cc",
"peerconnection/rtc_quic_transport_test.cc",
"peerconnection/rtc_quic_transport_test.h",
+ "peerconnection/rtc_sctp_transport_test.cc",
"picture_in_picture/picture_in_picture_controller_test.cc",
"presentation/mock_presentation_service.h",
"presentation/presentation_availability_state_test.cc",
@@ -351,13 +381,22 @@ jumbo_source_set("unit_tests") {
"webaudio/script_processor_node_test.cc",
"webaudio/stereo_panner_node_test.cc",
"webdatabase/quota_tracker_test.cc",
+ "webshare/navigator_share_test.cc",
"websockets/dom_websocket_test.cc",
"websockets/websocket_channel_impl_test.cc",
"worklet/animation_and_paint_worklet_thread_test.cc",
"worklet/worklet_thread_test_common.cc",
"worklet/worklet_thread_test_common.h",
+ "xr/xr_rigid_transform_test.cc",
+ "xr/xr_test_utils.cc",
+ "xr/xr_view_test.cc",
]
+ if (is_android && notouch_build) {
+ sources +=
+ [ "media_controls/touchless/media_controls_touchless_impl_test.cc" ]
+ }
+
configs += [
"//third_party/blink/renderer:config",
"//third_party/blink/renderer:inside_blink",