summaryrefslogtreecommitdiff
path: root/chromium/build
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-02-08 13:55:03 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-08-29 13:25:49 +0200
commit459b15390012fabd08f068e7dd6550980b740914 (patch)
tree1c989f5b13dcfe1830a6b8e8d94f0a7486a2d399 /chromium/build
parent3f35491df051897f79cbc5e0534a50245c136496 (diff)
downloadqtwebengine-chromium-459b15390012fabd08f068e7dd6550980b740914.tar.gz
Unbundle Linux system libraries for GN
Adds unbundling on linux for the zlib, minizip, libpng, libwebp, libevent, libxml, libxslt and snappy libraries. Change-Id: I7bc8f418669a9908f0c1bc9393771e233f9f491a Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/build')
-rw-r--r--chromium/build/config/compiler/BUILD.gn2
-rw-r--r--chromium/build/shim_headers.gni2
2 files changed, 2 insertions, 2 deletions
diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
index 2ec453715f2..69798296690 100644
--- a/chromium/build/config/compiler/BUILD.gn
+++ b/chromium/build/config/compiler/BUILD.gn
@@ -184,8 +184,8 @@ if (use_debug_fission == "default") {
# this and specify their own include paths.
config("default_include_dirs") {
include_dirs = [
- "//",
root_gen_dir,
+ "//",
]
}
diff --git a/chromium/build/shim_headers.gni b/chromium/build/shim_headers.gni
index 6225ed9223d..a71ea6ec406 100644
--- a/chromium/build/shim_headers.gni
+++ b/chromium/build/shim_headers.gni
@@ -5,7 +5,7 @@
template("shim_headers") {
action_name = "gen_${target_name}"
config_name = "${target_name}_config"
- shim_headers_path = "${root_gen_dir}/shim_headers/${target_name}"
+ shim_headers_path = "${root_gen_dir}"
config(config_name) {
include_dirs = [ shim_headers_path ]