1 files changed, 46 insertions, 84 deletions
diff --git a/src/core/config/common.pri b/src/core/config/common.pri
index f87eca6e5..c39c1f1c0 100644
--- a/src/core/config/common.pri
+++ b/src/core/config/common.pri
@@ -1,95 +1,57 @@
 # Shared configuration for all our supported platforms
 
-use?(gn) {
-    gn_args += \
-        use_qt=true \
-        is_component_build=false \
-        is_shared=true \
-        enable_media_router=false \
-        enable_nacl=false \
-        enable_remoting=false \
-        enable_web_speech=false \
-        use_experimental_allocator_shim=false \
-        use_allocator=\"none\" \
-        v8_use_external_startup_data=false \
-        treat_warnings_as_errors=false
-
-    use?(printing) {
-        gn_args += enable_basic_printing=true enable_print_preview=true
-    } else {
-        gn_args += enable_basic_printing=false enable_print_preview=false
-    }
-
-    use?(pdf) {
-        gn_args += enable_pdf=true
-    } else {
-        gn_args += enable_pdf=false
-    }
-
-    use?(pepper_plugins) {
-        gn_args += enable_plugins=true enable_widevine=true
-    } else {
-        gn_args += enable_plugins=false enable_widevine=false
-    }
-
-    use?(spellchecker) {
-        gn_args += enable_spellcheck=true
-    } else {
-        gn_args += enable_spellcheck=false
-    }
-
-    use?(webrtc) {
-        gn_args += enable_webrtc=true
-    } else {
-        gn_args += enable_webrtc=false
-    }
-
-    use?(proprietary_codecs): gn_args += proprietary_codecs=true ffmpeg_branding=\"Chrome\"
-
-    CONFIG(release, debug|release) {
-        force_debug_info: gn_args += symbol_level=1
-        else: gn_args += symbol_level=0
-    }
-
-    !webcore_debug: gn_args += remove_webcore_debug_symbols=true
-    !v8base_debug: gn_args += remove_v8base_debug_symbols=true
+gn_args += \
+    use_qt=true \
+    is_component_build=false \
+    is_shared=true \
+    enable_media_router=false \
+    enable_nacl=false \
+    enable_remoting=false \
+    enable_web_speech=false \
+    use_experimental_allocator_shim=false \
+    use_allocator=\"none\" \
+    v8_use_external_startup_data=false \
+    treat_warnings_as_errors=false
+
+use?(printing) {
+    gn_args += enable_basic_printing=true enable_print_preview=true
+} else {
+    gn_args += enable_basic_printing=false enable_print_preview=false
+}
 
-    # Compiling with -Os makes a huge difference in binary size
-    contains(WEBENGINE_CONFIG, reduce_binary_size): gn_args += optimize_for_size=true
+use?(pdf) {
+    gn_args += enable_pdf=true
+} else {
+    gn_args += enable_pdf=false
+}
 
+use?(pepper_plugins) {
+    gn_args += enable_plugins=true enable_widevine=true
 } else {
-    # Trigger Qt-specific build conditions.
-    GYP_CONFIG += use_qt=1
-    # We do not want to ship more external binary blobs, so let v8 embed its startup data.
-    GYP_CONFIG += v8_use_external_startup_data=0
-    # WebSpeech requires Google API keys and adds dependencies on speex and flac.
-    GYP_CONFIG += enable_web_speech=0
-    # We do not use or even include the extensions
-    GYP_CONFIG += enable_extensions=0
+    gn_args += enable_plugins=false enable_widevine=false
+}
 
-    sanitize_address: GYP_CONFIG += asan=1
-    sanitize_thread: GYP_CONFIG += tsan=1
-    sanitize_memory: GYP_CONFIG += msan=1
-    sanitize_undefined: GYP_CONFIG += ubsan=1
+use?(spellchecker) {
+    gn_args += enable_spellcheck=true
+} else {
+    gn_args += enable_spellcheck=false
+}
 
-    use?(printing) {
-        GYP_CONFIG += enable_basic_printing=1 enable_print_preview=1
-    } else {
-        GYP_CONFIG += enable_basic_printing=0 enable_print_preview=0
-    }
+use?(webrtc) {
+    gn_args += enable_webrtc=true
+} else {
+    gn_args += enable_webrtc=false
+}
 
-    use?(pdf) {
-        GYP_CONFIG += enable_pdf=1
-    } else {
-        GYP_CONFIG += enable_pdf=0
-    }
+use?(proprietary_codecs): gn_args += proprietary_codecs=true ffmpeg_branding=\"Chrome\"
 
-    use?(pepper_plugins) {
-        GYP_CONFIG += enable_plugins=1 enable_widevine=1
-    } else {
-        GYP_CONFIG += enable_plugins=0 enable_widevine=0
-    }
+CONFIG(release, debug|release) {
+    force_debug_info: gn_args += symbol_level=1
+    else: gn_args += symbol_level=0
 }
 
-use?(webrtc): GYP_CONFIG += enable_webrtc=1
-else: GYP_CONFIG += enable_webrtc=0
+!webcore_debug: gn_args += remove_webcore_debug_symbols=true
+!v8base_debug: gn_args += remove_v8base_debug_symbols=true
+
+# Compiling with -Os makes a huge difference in binary size
+contains(WEBENGINE_CONFIG, reduce_binary_size): gn_args += optimize_for_size=true