Unite commmon linux platform configuration

Move duplicated linux configuration to linux.pri

Change-Id: I9f6f876e09fb748fb78cfbd5201a4326693f0be9
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

3 files changed, 44 insertions, 60 deletions

diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri
index 5c61a8b7b..f0bf6cb23 100644
--- a/src/core/config/desktop_linux.pri
+++ b/src/core/config/desktop_linux.pri
@@ -1,39 +1,10 @@
 GYP_ARGS += "-D qt_os=\"desktop_linux\""
 
+include(linux.pri)
+
 GYP_CONFIG += \
     desktop_linux=1 \
-    toolkit_uses_gtk=0 \
-    use_aura=1 \
-    use_ash=0 \
-    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 \
     enable_plugins=1 \
 
 linux-clang: GYP_CONFIG += clang=1 host_clang=1 clang_use_chrome_plugins=0 make_clang_dir=/usr
 else: GYP_CONFIG += clang=0 host_clang=0
-
-contains(QT_CONFIG, system-zlib): config_system_minizip: GYP_CONFIG += use_system_zlib=1
-contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1
-contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1
-contains(QT_CONFIG, system-harfbuzz): GYP_CONFIG += use_system_harfbuzz=1
-config_system_libevent: GYP_CONFIG += use_system_libevent=1
-config_system_libwebp: GYP_CONFIG += use_system_libwebp=1
-config_system_libsrtp: GYP_CONFIG += use_system_libsrtp=1
-config_system_libxslt: GYP_CONFIG += use_system_libxml=1
-config_system_flac: GYP_CONFIG += use_system_flac=1
-config_system_jsoncpp: GYP_CONFIG += use_system_jsoncpp=1
-config_system_opus: GYP_CONFIG += use_system_opus=1
-config_system_snappy: GYP_CONFIG += use_system_snappy=1
-config_system_speex: GYP_CONFIG += use_system_speex=1
-config_system_vpx: GYP_CONFIG += use_system_libvpx=1
-
-contains(WEBENGINE_CONFIG, use_system_icu): GYP_CONFIG += use_system_icu=1
-contains(WEBENGINE_CONFIG, use_system_ffmpeg): GYP_CONFIG += use_system_ffmpeg=1
-
-!contains(QT_CONFIG, pulseaudio): GYP_CONFIG += use_pulseaudio=0
diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri
index c87938b45..cd12204f9 100644
--- a/src/core/config/embedded_linux.pri
+++ b/src/core/config/embedded_linux.pri
@@ -1,5 +1,7 @@
 GYP_ARGS += "-D qt_os=\"embedded_linux\" -I config/embedded_linux.gypi"
 
+include(linux.pri)
+
 GYP_CONFIG += \
     clang=0 \
     desktop_linux=0 \
@@ -29,43 +31,14 @@ GYP_CONFIG += \
     p2p_apis=0 \
     safe_browsing=0 \
     toolkit_views=1 \
-    use_ash=0 \
-    use_aura=1 \
-    use_cairo=0 \
-    use_clipboard_aurax11=0 \
-    use_cups=0 \
     use_custom_freetype=0 \
-    use_gconf=0 \
-    use_gio=0 \
-    use_gnome_keyring=0 \
-    use_kerberos=0 \
     use_libpci=0 \
     use_nss_certs=0 \
     use_openssl=1 \
     use_openssl_certs=1 \
     use_ozone=1 \
-    use_pango=0 \
     use_system_fontconfig=1 \
     icu_use_data_file_flag=0 \
     use_x11=0 \
     v8_use_snapshot=false \
     want_separate_host_toolset=1 \
-
-contains(QT_CONFIG, system-zlib): config_system_minizip: GYP_CONFIG += use_system_zlib=1
-contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1
-contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1
-contains(QT_CONFIG, system-harfbuzz): GYP_CONFIG += use_system_harfbuzz=1
-!contains(QT_CONFIG, pulseaudio): GYP_CONFIG += use_pulseaudio=0
-config_system_libevent: GYP_CONFIG += use_system_libevent=1
-config_system_libwebp: GYP_CONFIG += use_system_libwebp=1
-config_system_libsrtp: GYP_CONFIG += use_system_libsrtp=1
-config_system_libxslt: GYP_CONFIG += use_system_libxml=1
-config_system_flac: GYP_CONFIG += use_system_flac=1
-config_system_jsoncpp: GYP_CONFIG += use_system_jsoncpp=1
-config_system_opus: GYP_CONFIG += use_system_opus=1
-config_system_snappy: GYP_CONFIG += use_system_snappy=1
-config_system_speex: GYP_CONFIG += use_system_speex=1
-config_system_vpx: GYP_CONFIG += use_system_libvpx=1
-
-contains(WEBENGINE_CONFIG, use_system_icu): GYP_CONFIG += use_system_icu=1
-contains(WEBENGINE_CONFIG, use_system_ffmpeg): GYP_CONFIG += use_system_ffmpeg=1
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
new file mode 100644
index 000000000..4c2e70daf
--- /dev/null
+++ b/src/core/config/linux.pri
@@ -0,0 +1,40 @@
+# 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
+
+contains(QT_CONFIG, system-zlib): config_system_minizip: GYP_CONFIG += use_system_zlib=1
+contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1
+contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1
+contains(QT_CONFIG, system-harfbuzz): GYP_CONFIG += use_system_harfbuzz=1
+!contains(QT_CONFIG, pulseaudio): GYP_CONFIG += use_pulseaudio=0
+
+config_system_libevent: GYP_CONFIG += use_system_libevent=1
+config_system_libwebp: GYP_CONFIG += use_system_libwebp=1
+config_system_libsrtp: GYP_CONFIG += use_system_libsrtp=1
+config_system_libxslt: GYP_CONFIG += use_system_libxml=1
+config_system_flac: GYP_CONFIG += use_system_flac=1
+config_system_jsoncpp: GYP_CONFIG += use_system_jsoncpp=1
+config_system_opus: GYP_CONFIG += use_system_opus=1
+config_system_snappy: GYP_CONFIG += use_system_snappy=1
+config_system_speex: GYP_CONFIG += use_system_speex=1
+config_system_vpx: GYP_CONFIG += use_system_libvpx=1
+
+contains(WEBENGINE_CONFIG, use_system_icu): GYP_CONFIG += use_system_icu=1
+contains(WEBENGINE_CONFIG, use_system_ffmpeg): GYP_CONFIG += use_system_ffmpeg=1
+