diff options
| author | thakis <thakis@chromium.org> | 2016-01-27 17:06:37 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-28 01:16:03 +0000 |
| commit | 190db871a42f413b37dc683cb0959808671082d7 (patch) | |
| tree | 4ec77e7752824736e5b1b8b6c3144d3e7186e26c /build | |
| parent | 53cd62240b689e5fd8876580fff33a06c866928f (diff) | |
| download | chromium_src-190db871a42f413b37dc683cb0959808671082d7.zip chromium_src-190db871a42f413b37dc683cb0959808671082d7.tar.gz chromium_src-190db871a42f413b37dc683cb0959808671082d7.tar.bz2 | |
Only add -isystem for libc++ for C++ files, not C files.
Seems cleaner. libc++ recently added a few headers that shadow
C headers, and shouldn't pick those up when building C files.
No intended behavior change.
BUG=none
Review URL: https://codereview.chromium.org/1647493002
Cr-Commit-Position: refs/heads/master@{#371949}
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 2 | ||||
| -rw-r--r-- | build/config/android/BUILD.gn | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index 64dbc80..537c990 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -4829,6 +4829,8 @@ '-finline-limit=64', '<@(release_extra_cflags)', '--sysroot=<(android_ndk_sysroot)', + ], + 'cflags_cc': [ # NOTE: The libc++ header include paths below are specified in # cflags rather than include_dirs because they need to come # after include_dirs. diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn index d4a714b..203d917 100644 --- a/build/config/android/BUILD.gn +++ b/build/config/android/BUILD.gn @@ -123,13 +123,13 @@ config("compiler") { # that is Android-only. Please see that target for advice on what should go in # :runtime_library vs. :compiler. config("runtime_library") { - # NOTE: The libc++ header include paths below are specified in cflags + # NOTE: The libc++ header include paths below are specified in cflags_cc # rather than include_dirs because they need to come after include_dirs. # Think of them like system headers, but don't use '-isystem' because the # arm-linux-androideabi-4.4.3 toolchain (circa Gingerbread) will exhibit # strange errors. The include ordering here is important; change with # caution. - cflags = [ + cflags_cc = [ "-isystem" + rebase_path("$android_libcpp_root/libcxx/include", root_build_dir), "-isystem" + rebase_path( |