Remove gyp handling

Remove now dead GYP related code.

Change-Id: I7d5b8f28f8925e553211dc88acd571b605ffe80d
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

9 files changed, 211 insertions, 487 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
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri
index e6b11d290..9918e1bb2 100644
--- a/src/core/config/desktop_linux.pri
+++ b/src/core/config/desktop_linux.pri
@@ -1,32 +1,13 @@
 include(linux.pri)
 
-use?(gn) {
-    gn_args += \
-        use_sysroot=false \
-        enable_session_service=false \
-        enable_notifications=false \
-        toolkit_views=false
-
-    use?(icecc) {
-        gn_args += use_debug_fission=false
-    }
-    !use_gold_linker: gn_args += use_gold=false
-
-} else {
-
-    GYP_ARGS += "-D qt_os=\"desktop_linux\""
-
-    GYP_CONFIG += \
-        desktop_linux=1
-
-    clang {
-        GYP_CONFIG += werror=
-        clang_full_path = $$which($${QMAKE_CXX})
-        # Remove the "/bin/clang++" part.
-        clang_prefix = $$section(clang_full_path, /, 0, -3)
-        GYP_CONFIG += clang=1 host_clang=1 clang_use_chrome_plugins=0 make_clang_dir=$${clang_prefix}
-        linux-clang-libc++: GYP_CONFIG += use_system_libcxx=1
-    } else {
-        GYP_CONFIG += clang=0 host_clang=0
-    }
+gn_args += \
+    use_sysroot=false \
+    enable_session_service=false \
+    enable_notifications=false \
+    toolkit_views=false
+
+use?(icecc) {
+    gn_args += use_debug_fission=false
 }
+
+!use_gold_linker: gn_args += use_gold=false
diff --git a/src/core/config/embedded_linux.gypi b/src/core/config/embedded_linux.gypi
deleted file mode 100644
index f192243ce..000000000
--- a/src/core/config/embedded_linux.gypi
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  'target_defaults': {
-    # patterns used to exclude chromium files from the build when we have a drop-in replacement
-    'sources/': [
-      # We are using gl_context_qt.cc instead.
-      ['exclude', 'gl_context_ozone.cc$'],
-    ],
-  },
-}
diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri
index 11ed3e310..d5f6d4bf5 100644
--- a/src/core/config/embedded_linux.pri
+++ b/src/core/config/embedded_linux.pri
@@ -1,58 +1,18 @@
-GYP_ARGS += "-D qt_os=\"embedded_linux\" -I config/embedded_linux.gypi"
-
 include(linux.pri)
 
-use?(gn) {
-    gn_args += \
-        is_desktop_linux=false \
-        use_gold=false \
-        use_ozone=true \
-        use_sysroot=false \
-        enable_session_service=false \
-        enable_notifications=false \
-        ozone_auto_platforms=false \
-        ozone_platform_headless=true \
-        ozone_platform_external=true \
-        ozone_platform=\"qt\" \
-        toolkit_views=false
+gn_args += \
+    is_desktop_linux=false \
+    use_gold=false \
+    use_ozone=true \
+    use_sysroot=false \
+    enable_session_service=false \
+    enable_notifications=false \
+    ozone_auto_platforms=false \
+    ozone_platform_headless=true \
+    ozone_platform_external=true \
+    ozone_platform=\"qt\" \
+    toolkit_views=false
 
-    use?(icecc) {
-        gn_args += use_debug_fission=false
-    }
+use?(icecc) {
+    gn_args += use_debug_fission=false
 }
-
-GYP_CONFIG += \
-    clang=0 \
-    desktop_linux=0 \
-    disable_nacl=1 \
-    embedded=1 \
-    enable_autofill_dialog=0 \
-    enable_automation=0 \
-    enable_captive_portal_detection=0 \
-    enable_extensions=0 \
-    enable_google_now=0 \
-    enable_language_detection=0 \
-    enable_managed_users=0 \
-    enable_plugin_installation=0 \
-    enable_session_service=0 \
-    enable_task_manager=0 \
-    enable_themes=0 \
-    gtest_target_type=none \
-    host_clang=0 \
-    notifications=0 \
-    ozone_auto_platforms=0 \
-    ozone_platform_dri=0 \
-    ozone_platform_test=0 \
-    p2p_apis=0 \
-    safe_browsing=0 \
-    toolkit_views=1 \
-    use_custom_freetype=0 \
-    use_libpci=0 \
-    use_ozone=1 \
-    use_system_fontconfig=1 \
-    use_x11=0 \
-    v8_use_snapshot=false \
-    want_separate_host_toolset=1 \
-    angle_enable_gl=0
-
-WEBENGINE_CONFIG *= reduce_binary_size
diff --git a/src/core/config/embedded_qnx.gypi b/src/core/config/embedded_qnx.gypi
deleted file mode 100644
index f192243ce..000000000
--- a/src/core/config/embedded_qnx.gypi
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  'target_defaults': {
-    # patterns used to exclude chromium files from the build when we have a drop-in replacement
-    'sources/': [
-      # We are using gl_context_qt.cc instead.
-      ['exclude', 'gl_context_ozone.cc$'],
-    ],
-  },
-}
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
index 950e4e4b4..84ce73bfa 100644
--- a/src/core/config/linux.pri
+++ b/src/core/config/linux.pri
@@ -2,215 +2,149 @@ include(common.pri)
 include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
 QT_FOR_CONFIG += gui-private webengine-private
 
-use?(gn) {
+gn_args += \
+    use_cups=false \
+    use_gconf=false \
+    use_gio=false \
+    use_gnome_keyring=false \
+    use_kerberos=false \
+    linux_use_bundled_binutils=false
+
+use?(nss) {
     gn_args += \
-        use_cups=false \
-        use_gconf=false \
-        use_gio=false \
-        use_gnome_keyring=false \
-        use_kerberos=false \
-        linux_use_bundled_binutils=false
-
-    use?(nss) {
-        gn_args += \
-            use_nss_certs=true \
-            use_openssl_certs=false
-    } else {
-        gn_args += \
-            use_nss_certs=false \
-            use_openssl_certs=true
-    }
-    gcc:!clang: greaterThan(QT_GCC_MAJOR_VERSION, 5): gn_args += no_delete_null_pointer_checks=true
-
-    clang {
-        clang_full_path = $$which($${QMAKE_CXX})
-        # Remove the "/bin/clang++" part.
-        clang_prefix = $$section(clang_full_path, /, 0, -3)
-        gn_args += \
-            is_clang=true \
-            clang_use_chrome_plugins=false \
-            clang_base_path=\"$${clang_prefix}\"
-
-        linux-clang-libc++: gn_args += use_libcxx=true
-    } else {
-        gn_args += \
-            is_clang=false
-    }
+        use_nss_certs=true \
+        use_openssl_certs=false
+} else {
+    gn_args += \
+        use_nss_certs=false \
+        use_openssl_certs=true
+}
+gcc:!clang: greaterThan(QT_GCC_MAJOR_VERSION, 5): gn_args += no_delete_null_pointer_checks=true
 
-    cross_compile:!host_build {
-        TOOLCHAIN_SYSROOT = $$[QT_SYSROOT]
-        !isEmpty(TOOLCHAIN_SYSROOT): gn_args += target_sysroot=\"$${TOOLCHAIN_SYSROOT}\"
-    }
+clang {
+    clang_full_path = $$which($${QMAKE_CXX})
+    # Remove the "/bin/clang++" part.
+    clang_prefix = $$section(clang_full_path, /, 0, -3)
+    gn_args += \
+        is_clang=true \
+        clang_use_chrome_plugins=false \
+        clang_base_path=\"$${clang_prefix}\"
 
-    contains(QT_ARCH, "arm") {
-        # Extract ARM specific compiler options that we have to pass to gn,
-        # but let gn figure out a default if an option is not present.
-        MTUNE = $$extractCFlag("-mtune=.*")
-        !isEmpty(MTUNE): gn_args += arm_tune=\"$$MTUNE\"
+    linux-clang-libc++: gn_args += use_libcxx=true
+} else {
+    gn_args += \
+        is_clang=false
+}
 
-        MFLOAT = $$extractCFlag("-mfloat-abi=.*")
-        !isEmpty(MFLOAT): gn_args += arm_float_abi=\"$$MFLOAT\"
+cross_compile:!host_build {
+    TOOLCHAIN_SYSROOT = $$[QT_SYSROOT]
+    !isEmpty(TOOLCHAIN_SYSROOT): gn_args += target_sysroot=\"$${TOOLCHAIN_SYSROOT}\"
+}
 
-        MARCH = $$extractCFlag("-march=.*")
+contains(QT_ARCH, "arm") {
+    # Extract ARM specific compiler options that we have to pass to gn,
+    # but let gn figure out a default if an option is not present.
+    MTUNE = $$extractCFlag("-mtune=.*")
+    !isEmpty(MTUNE): gn_args += arm_tune=\"$$MTUNE\"
 
-        MARMV = $$replace(MARCH, "armv",)
-        !isEmpty(MARMV) {
-            MARMV = $$split(MARMV,)
-            MARMV = $$member(MARMV, 0)
-            lessThan(MARMV, 6): error("$$MARCH architecture is not supported")
-            gn_args += arm_version=$$MARMV
-        }
+    MFLOAT = $$extractCFlag("-mfloat-abi=.*")
+    !isEmpty(MFLOAT): gn_args += arm_float_abi=\"$$MFLOAT\"
 
-        !lessThan(MARMV, 8) {
-            gn_args += arm_use_neon=true
-        } else {
-            MFPU = $$extractCFlag("-mfpu=.*")
-            !isEmpty(MFPU):contains(MFPU, ".*neon.*") {
-                gn_args += arm_use_neon=true
-            } else {
-                gn_args += arm_use_neon=false
-                # If the toolchain does not explicitly specify to use NEON instructions
-                # we use arm_neon_optional for ARMv7
-                equals(MARMV, 7): gn_args += arm_optionally_use_neon=true
-            }
-        }
+    MARCH = $$extractCFlag("-march=.*")
 
-        if(isEmpty(MARMV)|lessThan(MARMV, 7)):contains(QMAKE_CFLAGS, "-marm"): gn_args += arm_use_thumb=false
-        else: contains(QMAKE_CFLAGS, "-mthumb"): gn_args += arm_use_thumb=true
+    MARMV = $$replace(MARCH, "armv",)
+    !isEmpty(MARMV) {
+        MARMV = $$split(MARMV,)
+        MARMV = $$member(MARMV, 0)
+        lessThan(MARMV, 6): error("$$MARCH architecture is not supported")
+        gn_args += arm_version=$$MARMV
     }
 
-    contains(QT_ARCH, "mips") {
-        MARCH = $$extractCFlag("-march=.*")
-        !isEmpty(MARCH) {
-            equals(MARCH, "mips32r6"): gn_args += mips_arch_variant=\"r6\"
-            else: equals(MARCH, "mips32r2"): gn_args += mips_arch_variant=\"r2\"
-            else: equals(MARCH, "mips32"): gn_args += mips_arch_variant=\"r1\"
+    !lessThan(MARMV, 8) {
+        gn_args += arm_use_neon=true
+    } else {
+        MFPU = $$extractCFlag("-mfpu=.*")
+        !isEmpty(MFPU):contains(MFPU, ".*neon.*") {
+            gn_args += arm_use_neon=true
         } else {
-            contains(QMAKE_CFLAGS, "mips32r6"): gn_args += mips_arch_variant=\"r6\"
-            else: contains(QMAKE_CFLAGS, "mips32r2"): gn_args += mips_arch_variant=\"r2\"
-            else: contains(QMAKE_CFLAGS, "mips32"): gn_args += mips_arch_variant=\"r1\"
+            gn_args += arm_use_neon=false
+            # If the toolchain does not explicitly specify to use NEON instructions
+            # we use arm_neon_optional for ARMv7
+            equals(MARMV, 7): gn_args += arm_optionally_use_neon=true
         }
-
-        contains(QMAKE_CFLAGS, "-mmsa"): gn_args += mips_use_msa=true
-
-        contains(QMAKE_CFLAGS, "-mdsp2"): gn_args += mips_dsp_rev=2
-        else: contains(QMAKE_CFLAGS, "-mdsp"): gn_args += mips_dsp_rev=1
     }
 
-    host_build {
-        gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
-        # Don't bother trying to use system libraries in this case
-        gn_args += use_glib=false
-        gn_args += use_system_libffi=false
-    } else {
-        gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:target\"
-        cross_compile {
-            gn_args += host_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
-            gn_args += v8_snapshot_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:v8_snapshot\"
-            GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
-            GN_TARGET_CPU = $$gnArch($$QT_ARCH)
-            gn_args += host_cpu=\"$$GN_HOST_CPU\" target_cpu=\"$$GN_TARGET_CPU\"
-        }
-        !contains(QT_CONFIG, no-pkg-config) {
-            # Strip '>2 /dev/null' from $$pkgConfigExecutable()
-            PKGCONFIG = $$first($$list($$pkgConfigExecutable()))
-            gn_args += pkg_config=\"$$PKGCONFIG\"
-        }
+    if(isEmpty(MARMV)|lessThan(MARMV, 7)):contains(QMAKE_CFLAGS, "-marm"): gn_args += arm_use_thumb=false
+    else: contains(QMAKE_CFLAGS, "-mthumb"): gn_args += arm_use_thumb=true
+}
 
-        qtConfig(system-zlib): use?(system_minizip): gn_args += use_system_zlib=true use_system_minizip=true
-        qtConfig(system-png): gn_args += use_system_libpng=true
-        qtConfig(system-jpeg): gn_args += use_system_libjpeg=true
-        use?(system_harfbuzz): gn_args += use_system_harfbuzz=true
-        !use?(glib): gn_args += use_glib=false
-        qtConfig(pulseaudio) {
-            gn_args += use_pulseaudio=true
-        } else {
-            gn_args += use_pulseaudio=false
-        }
-        qtConfig(alsa) {
-            gn_args += use_alsa=true
-        } else {
-            gn_args += use_alsa=false
-        }
-        packagesExist(libffi): gn_args += use_system_libffi=true
-        else: gn_args += use_system_libffi=false
-        !packagesExist(libpci): gn_args += use_libpci=false
-        !packagesExist(xscrnsaver): gn_args += use_xscrnsaver=false
-
-        use?(system_libevent): gn_args += use_system_libevent=true
-        use?(system_libwebp):  gn_args += use_system_libwebp=true
-        #use?(system_libsrtp):  gn_args += use_system_libsrtp=true
-        use?(system_libxslt):  gn_args += use_system_libxml=true use_system_libxslt=true
-        #use?(system_jsoncpp):  gn_args += use_system_jsoncpp=true
-        use?(system_opus):     gn_args += use_system_opus=true
-        use?(system_snappy):   gn_args += use_system_snappy=true
-        use?(system_vpx):      gn_args += use_system_libvpx=true
-        use?(system_icu):      gn_args += use_system_icu=true icu_use_data_file=false
-        use?(system_ffmpeg):   gn_args += use_system_ffmpeg=true
-        #use?(system_protobuf): gn_args += use_system_protobuf=true
+contains(QT_ARCH, "mips") {
+    MARCH = $$extractCFlag("-march=.*")
+    !isEmpty(MARCH) {
+        equals(MARCH, "mips32r6"): gn_args += mips_arch_variant=\"r6\"
+        else: equals(MARCH, "mips32r2"): gn_args += mips_arch_variant=\"r2\"
+        else: equals(MARCH, "mips32"): gn_args += mips_arch_variant=\"r1\"
+    } else {
+        contains(QMAKE_CFLAGS, "mips32r6"): gn_args += mips_arch_variant=\"r6\"
+        else: contains(QMAKE_CFLAGS, "mips32r2"): gn_args += mips_arch_variant=\"r2\"
+        else: contains(QMAKE_CFLAGS, "mips32"): gn_args += mips_arch_variant=\"r1\"
     }
-}
 
-# linux_use_bundled_gold currently relies on a hardcoded relative path from chromium/src/out/(Release|Debug)
-# Disable it along with the -Wl,--threads flag just in case gold isn't installed on the system.
-GYP_CONFIG += \
-    linux_use_bundled_gold=0 \
-    linux_use_bundled_binutils=0 \
-    linux_use_gold_flags=0 \
-
-GYP_CONFIG += \
-    toolkit_uses_gtk=0 \
-    use_ash=0 \
-    use_aura=1 \
-    use_cairo=0 \
-    use_clipboard_aurax11=0 \
-    use_cups=0 \
-    use_gconf=0 \
-    use_gio=0 \
-    use_gnome_keyring=0 \
-    use_kerberos=0 \
-    use_pango=0 \
-    use_openssl=1 \
-    use_allocator=none \
-    use_experimental_allocator_shim=0
+    contains(QMAKE_CFLAGS, "-mmsa"): gn_args += mips_use_msa=true
 
-use?(nss) {
-    GYP_CONFIG += \
-        use_nss_certs=1 \
-        use_nss_verifier=1 \
-        use_openssl_certs=0
-} else {
-    GYP_CONFIG += \
-        use_nss_certs=0 \
-        use_nss_verifier=0 \
-        use_openssl_certs=1
+    contains(QMAKE_CFLAGS, "-mdsp2"): gn_args += mips_dsp_rev=2
+    else: contains(QMAKE_CFLAGS, "-mdsp"): gn_args += mips_dsp_rev=1
 }
 
-gcc:!clang: greaterThan(QT_GCC_MAJOR_VERSION, 5): GYP_CONFIG += no_delete_null_pointer_checks=1
-
-qtConfig(system-zlib): use?(system_minizip): GYP_CONFIG += use_system_zlib=1
-qtConfig(system-png): GYP_CONFIG += use_system_libpng=1
-qtConfig(system-jpeg): GYP_CONFIG += use_system_libjpeg=1
-qtConfig(system-harfbuzz): use?(system_harfbuzz): GYP_CONFIG += use_system_harfbuzz=1
-!qtConfig(glib): GYP_CONFIG += use_glib=0
-qtConfig(pulseaudio) {
-    GYP_CONFIG += use_pulseaudio=1
-} else {
-    GYP_CONFIG += use_pulseaudio=0
-}
-qtConfig(alsa) {
-    GYP_CONFIG += use_alsa=1
+host_build {
+    gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
+    # Don't bother trying to use system libraries in this case
+    gn_args += use_glib=false
+    gn_args += use_system_libffi=false
 } else {
-    GYP_CONFIG += use_alsa=0
+    gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:target\"
+    cross_compile {
+        gn_args += host_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
+        gn_args += v8_snapshot_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:v8_snapshot\"
+        GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
+        GN_TARGET_CPU = $$gnArch($$QT_ARCH)
+        gn_args += host_cpu=\"$$GN_HOST_CPU\" target_cpu=\"$$GN_TARGET_CPU\"
+    }
+    !contains(QT_CONFIG, no-pkg-config) {
+        # Strip '>2 /dev/null' from $$pkgConfigExecutable()
+        PKGCONFIG = $$first($$list($$pkgConfigExecutable()))
+        gn_args += pkg_config=\"$$PKGCONFIG\"
+    }
+
+    qtConfig(system-zlib): use?(system_minizip): gn_args += use_system_zlib=true use_system_minizip=true
+    qtConfig(system-png): gn_args += use_system_libpng=true
+    qtConfig(system-jpeg): gn_args += use_system_libjpeg=true
+    use?(system_harfbuzz): gn_args += use_system_harfbuzz=true
+    !use?(glib): gn_args += use_glib=false
+    qtConfig(pulseaudio) {
+        gn_args += use_pulseaudio=true
+    } else {
+        gn_args += use_pulseaudio=false
+    }
+    qtConfig(alsa) {
+        gn_args += use_alsa=true
+    } else {
+        gn_args += use_alsa=false
+    }
+    packagesExist(libffi): gn_args += use_system_libffi=true
+    else: gn_args += use_system_libffi=false
+    !packagesExist(libpci): gn_args += use_libpci=false
+    !packagesExist(xscrnsaver): gn_args += use_xscrnsaver=false
+
+    use?(system_libevent): gn_args += use_system_libevent=true
+    use?(system_libwebp):  gn_args += use_system_libwebp=true
+    #use?(system_libsrtp):  gn_args += use_system_libsrtp=true
+    use?(system_libxslt):  gn_args += use_system_libxml=true use_system_libxslt=true
+    #use?(system_jsoncpp):  gn_args += use_system_jsoncpp=true
+    use?(system_opus):     gn_args += use_system_opus=true
+    use?(system_snappy):   gn_args += use_system_snappy=true
+    use?(system_vpx):      gn_args += use_system_libvpx=true
+    use?(system_icu):      gn_args += use_system_icu=true icu_use_data_file=false
+    use?(system_ffmpeg):   gn_args += use_system_ffmpeg=true
+    #use?(system_protobuf): gn_args += use_system_protobuf=true
 }
-use?(system_libevent): GYP_CONFIG += use_system_libevent=1
-use?(system_libwebp):  GYP_CONFIG += use_system_libwebp=1
-use?(system_libsrtp):  GYP_CONFIG += use_system_libsrtp=1
-use?(system_libxslt):  GYP_CONFIG += use_system_libxml=1
-use?(system_jsoncpp):  GYP_CONFIG += use_system_jsoncpp=1
-use?(system_opus):     GYP_CONFIG += use_system_opus=1
-use?(system_snappy):   GYP_CONFIG += use_system_snappy=1
-use?(system_vpx):      GYP_CONFIG += use_system_libvpx=1
-use?(system_icu):      GYP_CONFIG += use_system_icu=1 icu_use_data_file_flag=0
-use?(system_ffmpeg):   GYP_CONFIG += use_system_ffmpeg=1
-use?(system_protobuf): GYP_CONFIG += use_system_protobuf=1
diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
index 76890a6a4..cdd1ce7b6 100644
--- a/src/core/config/mac_osx.pri
+++ b/src/core/config/mac_osx.pri
@@ -21,44 +21,22 @@ message("Using clang++ from $${QMAKE_CLANG_PATH}")
 system("$${QMAKE_CLANG_PATH} --version")
 
 
-use?(gn) {
-    gn_args += \
-        is_clang=true \
-        use_sysroot=false \
-        use_kerberos=false \
-        clang_base_path=\"$${QMAKE_CLANG_DIR}\" \
-        clang_use_chrome_plugins=false \
-        mac_deployment_target=\"$${QMAKE_MACOSX_DEPLOYMENT_TARGET}\" \
-        mac_sdk_min=\"$${QMAKE_MAC_SDK_VERSION}\" \
-        toolkit_views=false \
-        use_external_popup_menu=false
-
-    use?(spellchecker) {
-        use?(native_spellchecker): gn_args += use_browser_spellchecker=true
-        else: gn_args += use_browser_spellchecker=false
-    } else {
-        macos: gn_args += use_browser_spellchecker=false
-    }
-
-    use?(appstore_compliant_code): gn_args += appstore_compliant_code=true
-
+gn_args += \
+    is_clang=true \
+    use_sysroot=false \
+    use_kerberos=false \
+    clang_base_path=\"$${QMAKE_CLANG_DIR}\" \
+    clang_use_chrome_plugins=false \
+    mac_deployment_target=\"$${QMAKE_MACOSX_DEPLOYMENT_TARGET}\" \
+    mac_sdk_min=\"$${QMAKE_MAC_SDK_VERSION}\" \
+    toolkit_views=false \
+    use_external_popup_menu=false
+
+use?(spellchecker) {
+    use?(native_spellchecker): gn_args += use_browser_spellchecker=true
+    else: gn_args += use_browser_spellchecker=false
 } else {
-    GYP_CONFIG += \
-        qt_os=\"mac\" \
-        mac_sdk_min=\"$${QMAKE_MAC_SDK_VERSION}\" \
-        mac_deployment_target=\"$${QMAKE_MACOSX_DEPLOYMENT_TARGET}\" \
-        make_clang_dir=\"$${QMAKE_CLANG_DIR}\" \
-        clang_use_chrome_plugins=0
-
-    # Force touch API is used in 49-based Chromium, which is included starting with 10.10.3 SDK, so we
-    # disable the API usage if the SDK version is lower.
-    !isMinOSXSDKVersion(10, 10, 3): GYP_CONFIG += disable_force_touch=1
-
-    # Pass a supported -fstack-protect flag depending on Xcode version.
-    lessThan(QMAKE_XCODE_VERSION, 6.3) {
-      GYP_CONFIG += use_xcode_stack_protector_strong=0
-    }
-
-    QMAKE_MAC_SDK_PATH = "$$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.path)"
-    exists($$QMAKE_MAC_SDK_PATH): GYP_CONFIG += mac_sdk_path=\"$${QMAKE_MAC_SDK_PATH}\"
+    macos: gn_args += use_browser_spellchecker=false
 }
+
+use?(appstore_compliant_code): gn_args += appstore_compliant_code=true
diff --git a/src/core/config/windows.gypi b/src/core/config/windows.gypi
deleted file mode 100644
index 0b9842c53..000000000
--- a/src/core/config/windows.gypi
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  'variables': {
-    'win_use_allocator_shim': 0,
-    'win_release_RuntimeLibrary': 2,
-    'win_debug_RuntimeLibrary': 3,
-    'chrome_multiple_dll': 0,
-  },
-}
diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri
index dddb2e953..bc086277f 100644
--- a/src/core/config/windows.pri
+++ b/src/core/config/windows.pri
@@ -1,5 +1,3 @@
-GYP_ARGS += "-D qt_os=\"win32\" -I config/windows.gypi"
-
 include(common.pri)
 
 gn_args += \
@@ -12,21 +10,6 @@ gn_args += \
     is_multi_dll_chrome=false \
     win_linker_timing=true
 
-GYP_CONFIG += \
-    disable_nacl=1 \
-    remoting=0 \
-    use_ash=0
-
-# Libvpx build needs additional search path on Windows.
-GYP_ARGS += "-D qtwe_chromium_obj_dir=\"$$OUT_PWD/$$getConfigDir()/obj/$${getChromiumSrcDir()}\""
-
-# Use path from environment for perl, bison and gperf instead of values set in WebKit's core.gypi.
-GYP_ARGS += "-D perl_exe=\"perl.exe\" -D bison_exe=\"bison.exe\" -D gperf_exe=\"gperf.exe\""
-
-# Gyp's parallel processing is broken on Windows
-GYP_ARGS += "--no-parallel"
-
-
 isDeveloperBuild() {
     gn_args += \
         is_win_fastlink=true \
@@ -36,52 +19,6 @@ isDeveloperBuild() {
         use_incremental_linking=false
 }
 
-qtConfig(angle) {
-    #FIXME: Expect LIBQTANGLE_NAME to be always set
-    #FIXME: Replace qt_egl_library and qt_glesv2_library into qt_angle_library
-    LIB_EGL=libEGL
-    LIB_GLESV2=libGLESv2
-    !isEmpty(LIBQTANGLE_NAME) {
-        LIB_EGL=$$LIBQTANGLE_NAME
-        LIB_GLESV2=$$LIBQTANGLE_NAME
-    }
-    CONFIG(release, debug|release) {
-        GYP_ARGS += "-D qt_egl_library=\"$${LIB_EGL}.lib\" -D qt_glesv2_library=\"$${LIB_GLESV2}.lib\""
-    } else {
-        GYP_ARGS += "-D qt_egl_library=\"$${LIB_EGL}d.lib\" -D qt_glesv2_library=\"$${LIB_GLESV2}d.lib\""
-    }
-    GYP_ARGS += "-D qt_gl=\"angle\""
-} else {
-    GYP_ARGS += "-D qt_gl=\"opengl\""
-}
-
-defineTest(usingMSVC32BitCrossCompiler) {
-    CL_DIR =
-    for(dir, QMAKE_PATH_ENV) {
-        exists($$dir/cl.exe) {
-            CL_DIR = $$dir
-            break()
-        }
-    }
-    isEmpty(CL_DIR): {
-        warning(Cannot determine location of cl.exe.)
-        return(false)
-    }
-    CL_DIR = $$system_path($$CL_DIR)
-    CL_DIR = $$split(CL_DIR, \\)
-    CL_PLATFORM = $$last(CL_DIR)
-    equals(CL_PLATFORM, amd64_x86): return(true)
-    return(false)
-}
-
-msvc:contains(QT_ARCH, "i386"):!usingMSVC32BitCrossCompiler() {
-    # The 32 bit MSVC linker runs out of memory if we do not remove all debug information.
-    GYP_CONFIG += fastbuild=2
-} else {
-    # Chromium builds with debug info in release by default but Qt doesn't
-    CONFIG(release, debug|release):!force_debug_info: GYP_CONFIG += fastbuild=1
-}
-
 msvc {
     equals(MSVC_VER, 14.0) {
         MSVS_VERSION = 2015
@@ -91,7 +28,6 @@ msvc {
         fatal("Visual Studio compiler version \"$$MSVC_VER\" is not supported by Qt WebEngine")
     }
 
-    GYP_ARGS += "-G msvs_version=$$MSVS_VERSION"
     gn_args += visual_studio_version=$$MSVS_VERSION
 
     SDK_PATH = $$(WINDOWSSDKDIR)
@@ -100,7 +36,6 @@ msvc {
     gn_args += windows_sdk_path=$$shell_quote($$SDK_PATH)
 
     contains(QT_ARCH, "i386"): gn_args += target_cpu=\"x86\"
-    isBuildingOnWin32(): GYP_ARGS += "-D windows_sdk_path=\"C:/Program Files/Windows Kits/10\""
 
 } else {
     fatal("Qt WebEngine for Windows can only be built with the Microsoft Visual Studio C++ compiler")