1 files changed, 22 insertions, 10 deletions
diff --git a/src/core/config/common.pri b/src/core/config/common.pri
index 42cf445df..fce89f576 100644
--- a/src/core/config/common.pri
+++ b/src/core/config/common.pri
@@ -4,6 +4,7 @@ QT_FOR_CONFIG += webenginecore
 
 gn_args += \
     use_qt=true \
+    closure_compile=false \
     is_component_build=false \
     is_shared=true \
     enable_message_center=false \
@@ -11,15 +12,20 @@ gn_args += \
     enable_nacl=false \
     enable_remoting=false \
     enable_reporting=false \
+    enable_swiftshader=false \
+    enable_web_auth=false \
     enable_web_speech=false \
     enable_widevine=true \
     has_native_accessibility=false \
+    enable_debugallocation=false \
     use_allocator_shim=false \
     use_allocator=\"none\" \
+    use_custom_libcxx=false \
     v8_use_external_startup_data=false \
+    toolkit_views=false \
     treat_warnings_as_errors=false \
-    enable_swiftshader=false \
-    use_custom_libcxx=false
+    safe_browsing_mode=0 \
+    optimize_webui=false
 
 !win32: gn_args += \
     use_jumbo_build=true \
@@ -49,11 +55,17 @@ qtConfig(webengine-spellchecker) {
 qtConfig(webengine-webrtc) {
     gn_args += enable_webrtc=true
 } else {
-    gn_args += enable_webrtc=false
+    gn_args += enable_webrtc=false audio_processing_in_audio_service_supported=false
 }
 
 qtConfig(webengine-proprietary-codecs): gn_args += proprietary_codecs=true ffmpeg_branding=\"Chrome\"
 
+qtConfig(webengine-extensions) {
+    gn_args += enable_extensions=true
+} else {
+    gn_args += enable_extensions=false
+}
+
 precompile_header {
     gn_args += enable_precompiled_headers=true
 } else {
@@ -81,6 +93,12 @@ CONFIG(release, debug|release) {
 CONFIG(debug, debug|release) {
     gn_args += is_debug=true
     gn_args += use_debug_fission=false
+    # MSVC requires iterator debug to always match and Qt has leaves it default on.
+    msvc: gn_args += enable_iterator_debugging=true
+
+    # We also can not have optimized V8 binaries for MSVC as iterator debugging
+    # would mismatch.
+    msvc|v8base_debug: gn_args += v8_optimized_debug=false
 }
 
 !webcore_debug: gn_args += remove_webcore_debug_symbols=true
@@ -91,14 +109,10 @@ optimize_size: gn_args += optimize_for_size=true
 
 # We don't want to apply sanitizer options to the build tools (GN, dict convert, etc).
 !host_build {
-    sanitizer: gn_args += sanitizer_keep_symbols=true
     sanitize_address: gn_args += is_asan=true
     sanitize_thread: gn_args += is_tsan=true
     sanitize_memory: gn_args += is_msan=true
-    # rtti is required for a specific check of ubsan, -fsanitize=vptr, which uses the runtime
-    # type information to check that correct derived objects are assigned to base pointers. Without
-    # rtti, linking would fail at build time.
-    sanitize_undefined: gn_args += is_ubsan=true use_rtti=true
+    sanitize_undefined: gn_args += is_ubsan=true is_ubsan_vptr=true
 }
 
 qtConfig(webengine-v8-snapshot) {
@@ -113,8 +127,6 @@ qtConfig(webengine-kerberos) {
     gn_args += use_kerberos=false
 }
 
-!msvc: gn_args += enable_iterator_debugging=false
-
 ccache {
     gn_args += cc_wrapper=\"ccache\"
 }