Simple adaptations to Chromium 55

The simplest adaptations to API and build changes in Chromium 55

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

5 files changed, 83 insertions, 13 deletions

diff --git a/src/core/config/common.pri b/src/core/config/common.pri
index 1239ae963..b23625462 100644
--- a/src/core/config/common.pri
+++ b/src/core/config/common.pri
@@ -4,8 +4,11 @@ use?(gn) {
     gn_args += \
         use_qt=true \
         is_component_build=false \
-        enable_remoting=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 \
@@ -40,6 +43,12 @@ use?(gn) {
     } else {
         gn_args += enable_webrtc=false
     }
+
+    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
 
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri
index f2ea4883a..10938a9f2 100644
--- a/src/core/config/desktop_linux.pri
+++ b/src/core/config/desktop_linux.pri
@@ -4,11 +4,14 @@ use?(gn) {
     gn_args += \
         is_clang=false \
         use_sysroot=false \
-        use_system_libffi=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 {
 
diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri
index c9de47562..853be7be9 100644
--- a/src/core/config/embedded_linux.pri
+++ b/src/core/config/embedded_linux.pri
@@ -2,6 +2,24 @@ 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 \
+        is_clang=false \
+        use_sysroot=false \
+        enable_session_service=false \
+        enable_notifications=false \
+        ozone_auto_platforms=false \
+        ozone_platform_headless=true \
+        toolkit_views=false
+
+    use?(icecc) {
+        gn_args += use_debug_fission=false
+    }
+}
+
 GYP_CONFIG += \
     clang=0 \
     desktop_linux=0 \
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
index 8509c0c8e..4854fae0d 100644
--- a/src/core/config/linux.pri
+++ b/src/core/config/linux.pri
@@ -4,16 +4,30 @@ 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
 
-    #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
+    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
+
+
+    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
-    qtConfig(system-harfbuzz): use?(system_harfbuzz): gn_args += use_system_harfbuzz=true
-    !qtConfig(glib): gn_args += use_glib=false
+    use?(system_harfbuzz): gn_args += use_system_harfbuzz=true
+    !use?(glib): gn_args += use_glib=false
     qtConfig(pulseaudio) {
         gn_args += use_pulseaudio=true
     } else {
@@ -24,20 +38,20 @@ use?(gn) {
     } else {
         gn_args += use_alsa=false
     }
+    packagesExist(libffi): gn_args += use_system_libffi=true
+    else: gn_args += use_system_libffi=false
 
-    #use?(system_libevent): gn_args += use_system_libevent=true
-    #use?(system_libwebp):  gn_args += use_system_libwebp=true
+    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_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_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_flag=false
+    #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
-
-    #gcc:!clang: greaterThan(QT_GCC_MAJOR_VERSION, 5): gn_args += no_delete_null_pointer_checks=true
 }
 
 # linux_use_bundled_gold currently relies on a hardcoded relative path from chromium/src/out/(Release|Debug)
diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri
index 334675481..d5b50842e 100644
--- a/src/core/config/windows.pri
+++ b/src/core/config/windows.pri
@@ -2,6 +2,16 @@ GYP_ARGS += "-D qt_os=\"win32\" -I config/windows.gypi"
 
 include(common.pri)
 
+gn_args += \
+    is_clang=false \
+    use_sysroot=false \
+    use_kerberos=true \
+    enable_notifications=false \
+    enable_session_service=false \
+    ninja_use_custom_environment_files=false \
+    is_multi_dll_chrome=false \
+    win_link_timing=true
+
 GYP_CONFIG += \
     disable_nacl=1 \
     remoting=0 \
@@ -16,6 +26,16 @@ GYP_ARGS += "-D perl_exe=\"perl.exe\" -D bison_exe=\"bison.exe\" -D gperf_exe=\"
 # Gyp's parallel processing is broken on Windows
 GYP_ARGS += "--no-parallel"
 
+
+isDeveloperBuild() {
+    gn_args += \
+        is_win_fastlink=true \
+        use_incremental_linking=true
+} else {
+    gn_args += \
+        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
@@ -70,6 +90,12 @@ msvc {
     }
 
     GYP_ARGS += "-G msvs_version=$$MSVS_VERSION"
+    gn_args += visual_studio_version=$$MSVS_VERSION
+
+    SDK_PATH = $$(WINDOWSSDKDIR)
+    VS_PATH= $$(VSINSTALLDIR)
+    gn_args += visual_studio_path=$$shell_quote($$VS_PATH)
+    gn_args += windows_sdk_path=$$shell_quote($$SDK_PATH)
 
     isBuildingOnWin32(): GYP_ARGS += "-D windows_sdk_path=\"C:/Program Files/Windows Kits/10\""