1 files changed, 20 insertions, 18 deletions
diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
index 97d39535c..9824897f0 100644
--- a/src/buildtools/config/common.pri
+++ b/src/buildtools/config/common.pri
@@ -8,25 +8,28 @@ gn_args += \
     closure_compile=false \
     is_component_build=false \
     is_shared=true \
+    enable_debugallocation=false \
+    enable_media_remoting=false \
     enable_message_center=false \
     enable_nacl=false \
     enable_remoting=false \
     enable_reporting=false \
     enable_resource_whitelist_generation=false \
     enable_swiftshader=false \
+    angle_enable_swiftshader=false \
     enable_web_auth=false \
     enable_web_speech=false \
     enable_widevine=true \
     has_native_accessibility=false \
-    enable_debugallocation=false \
+    optimize_webui=false \
+    safe_browsing_mode=0 \
+    strip_absolute_paths_from_debug_symbols=false \
+    toolkit_views=false \
+    treat_warnings_as_errors=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 \
-    safe_browsing_mode=0 \
-    optimize_webui=false \
     forbid_non_component_debug_builds=false
 
 greaterThan(QMAKE_JUMBO_MERGE_LIMIT,0) {
@@ -39,7 +42,7 @@ greaterThan(QMAKE_JUMBO_MERGE_LIMIT,0) {
     gn_args += jumbo_build_excluded="[\"browser\"]"
 }
 
-qtConfig(webengine-printing-and-pdf) {
+qtConfig(build-qtwebengine-core):qtConfig(webengine-printing-and-pdf) {
     gn_args += enable_basic_printing=true enable_print_preview=true
     gn_args += enable_pdf=true
 } else {
@@ -47,27 +50,31 @@ qtConfig(webengine-printing-and-pdf) {
     gn_args += enable_pdf=false
 }
 
-qtConfig(webengine-pepper-plugins) {
+qtConfig(build-qtwebengine-core):qtConfig(webengine-pepper-plugins) {
     gn_args += enable_plugins=true
 } else {
     gn_args += enable_plugins=false
 }
 
-qtConfig(webengine-spellchecker) {
+qtConfig(build-qtwebengine-core):qtConfig(webengine-spellchecker) {
     gn_args += enable_spellcheck=true
 } else {
     gn_args += enable_spellcheck=false
 }
 
-qtConfig(webengine-webrtc) {
+qtConfig(build-qtwebengine-core):qtConfig(webengine-webrtc) {
     gn_args += enable_webrtc=true
 } else {
     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(build-qtwebengine-core):qtConfig(webengine-proprietary-codecs) {
+    gn_args += proprietary_codecs=true ffmpeg_branding=\"Chrome\"
+} else {
+    gn_args += proprietary_codecs=false
+}
 
-qtConfig(webengine-extensions) {
+qtConfig(build-qtwebengine-core):qtConfig(webengine-extensions) {
     gn_args += enable_extensions=true
 } else {
     gn_args += enable_extensions=false
@@ -122,13 +129,7 @@ optimize_size: gn_args += optimize_for_size=true
     sanitize_undefined: gn_args += is_ubsan=true is_ubsan_vptr=true
 }
 
-qtConfig(webengine-v8-snapshot):qtConfig(webengine-v8-snapshot-support) {
-    gn_args += v8_use_snapshot=true
-} else {
-    gn_args += v8_use_snapshot=false
-}
-
-qtConfig(webengine-kerberos) {
+qtConfig(build-qtwebengine-core):qtConfig(webengine-kerberos) {
     gn_args += use_kerberos=true
 } else {
     gn_args += use_kerberos=false
@@ -139,3 +140,4 @@ ccache {
 }
 
 qtConfig(force_asserts): gn_args += dcheck_always_on=true
+