diff options
| author |  Mike Klein <mtklein@chromium.org> | 2018-02-26 10:11:35 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-26 15:33:17 +0000 |
| commit | 5279cdf1907e87e12934888d8ad70ceeb7bfc075 (patch) | |
| tree | 8ca03a5b35af875434dcfd443a05fb805b07c128 /third_party/third_party.gni | |
| parent | 96165ebeaa36a2aae0eedaf12d81f53d3caf999a (diff) | |
Revert -isystem related CLs.
Revert "use -isystem for headers from third_party"
This reverts commit 138bd155ed1d1c8696733b7060553f070f384678.
Revert "write -isystem paths relative to the build root"
This reverts commit 085bc523634ee3156cd4e5bc05d8907739b54e4c.
I suspect the first breaks building on systems with an old libpng
or zlib installed, and the second definitely breaks GN -> CMake.
Change-Id: I5b29669b21b1444daeec8fb784337422ee17311a
Reviewed-on: https://skia-review.googlesource.com/110183
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'third_party/third_party.gni')
| -rw-r--r-- | third_party/third_party.gni | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/third_party/third_party.gni b/third_party/third_party.gni index 613e1ad9c0..7aaf63586f 100644 --- a/third_party/third_party.gni +++ b/third_party/third_party.gni @@ -8,14 +8,7 @@ template("third_party") { if (defined(invoker.public_defines)) { defines = invoker.public_defines } - if (is_win) { - include_dirs = invoker.public_include_dirs - } else { - cflags = [] - foreach(dir, invoker.public_include_dirs) { - cflags += ["-isystem", rebase_path(dir, root_build_dir)] - } - } + include_dirs = invoker.public_include_dirs } source_set(target_name) { forward_variables_from(invoker, "*", [ "public_include_dirs" ]) |