Commit 190db871 authored by thakis's avatar thakis Committed by Commit bot

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}
parent 53cd6224
...@@ -4829,6 +4829,8 @@ ...@@ -4829,6 +4829,8 @@
'-finline-limit=64', '-finline-limit=64',
'<@(release_extra_cflags)', '<@(release_extra_cflags)',
'--sysroot=<(android_ndk_sysroot)', '--sysroot=<(android_ndk_sysroot)',
],
'cflags_cc': [
# NOTE: The libc++ header include paths below are specified in # NOTE: The libc++ header include paths below are specified in
# cflags rather than include_dirs because they need to come # cflags rather than include_dirs because they need to come
# after include_dirs. # after include_dirs.
......
...@@ -123,13 +123,13 @@ config("compiler") { ...@@ -123,13 +123,13 @@ config("compiler") {
# that is Android-only. Please see that target for advice on what should go in # that is Android-only. Please see that target for advice on what should go in
# :runtime_library vs. :compiler. # :runtime_library vs. :compiler.
config("runtime_library") { 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. # 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 # Think of them like system headers, but don't use '-isystem' because the
# arm-linux-androideabi-4.4.3 toolchain (circa Gingerbread) will exhibit # arm-linux-androideabi-4.4.3 toolchain (circa Gingerbread) will exhibit
# strange errors. The include ordering here is important; change with # strange errors. The include ordering here is important; change with
# caution. # caution.
cflags = [ cflags_cc = [
"-isystem" + "-isystem" +
rebase_path("$android_libcpp_root/libcxx/include", root_build_dir), rebase_path("$android_libcpp_root/libcxx/include", root_build_dir),
"-isystem" + rebase_path( "-isystem" + rebase_path(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment