summaryrefslogtreecommitdiffstats
path: root/src/core/config
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@digia.com>2014-09-25 08:16:00 -0700
committerZeno Albisser <zeno.albisser@digia.com>2014-10-06 20:34:19 +0200
commit363ce7231af21f14017c4c59da9aa90249f36f4e (patch)
tree8184e09bb43bfb557f01bf3d09e6a525a2edf852 /src/core/config
parent819a0905b29ad7be5599ed2b7285e8a12f3e228f (diff)
Update build configuration for eLinux after update to Chromium 37.
The build configuration requires the following changes: - toolkit_views=1: for native_theme_aura, as otherwise nine_image_painter_factory.cc would be excluded. - use_system_harfbuzz=0: we do not want to rely on this being provided on the system, therefore being explicit. - want_separate_host_toolset=1: assures that icuuc gyp target will be available. The file gl_surface_ozone.cc must be added to the exclusion list to avoid duplicate symbols with gl_surface_at.cpp. The defines EGL_API_FB and LINUX must be set to 1, to explicitly define that we are using EGL and are building for a linux target. Change-Id: If6722ecbfd0655fe7852d52a606f27c18304f717 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'src/core/config')
-rw-r--r--src/core/config/embedded_linux.pri4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri
index 88af144ba..dc6a5f612 100644
--- a/src/core/config/embedded_linux.pri
+++ b/src/core/config/embedded_linux.pri
@@ -29,6 +29,7 @@ GYP_CONFIG += \
p2p_apis=0 \
safe_browsing=0 \
toolkit_uses_gtk=0 \
+ toolkit_views=1 \
use_ash=0 \
use_aura=1 \
use_cairo=0 \
@@ -43,8 +44,9 @@ GYP_CONFIG += \
use_ozone=1 \
use_pango=0 \
use_pulseaudio=0 \
+ use_system_harfbuzz=0 \
use_system_icu=1 \
use_x11=0 \
v8_use_snapshot=false \
- want_separate_host_toolset=0 \
+ want_separate_host_toolset=1 \