Commit 843ca8c6 authored by thakis@chromium.org's avatar thakis@chromium.org

Include stlport through -isystem instead of -I.

Enables removing a TODO and is needed for the bug linked below.

(Doesn't work for the webkit build for some reason, but that's currently
not built with clang anyhow.)

BUG=381053
R=cjhopman@chromium.org
TBR=brettw@chromium.org
NOTRY=true

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=280406

Review URL: https://codereview.chromium.org/359783005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282046 0039d316-1c4b-4281-b951-d872f2087c98
parent 1426a022
......@@ -3886,16 +3886,6 @@
'-std=gnu++11',
],
}],
['clang==1 and OS=="android"', {
# Android uses stlport, whose include/new defines
# `void operator delete[](void* ptr) throw();`, which
# clang's -Wimplicit-exception-spec-mismatch warns about for some
# reason -- http://llvm.org/PR16638. TODO(thakis): Include stlport
# via -isystem instead.
'cflags_cc': [
'-Wno-implicit-exception-spec-mismatch',
],
}],
['clang==1 and clang_use_chrome_plugins==1', {
'cflags': [
'<@(clang_chrome_plugins_flags)',
......@@ -4525,7 +4515,7 @@
],
}, { # else: use_system_stlport!=1
'cflags': [
'-I<(android_stlport_include)',
'-isystem<(android_stlport_include)',
],
'ldflags': [
'-L<(android_stlport_libs_dir)',
......
......@@ -400,7 +400,8 @@ config("runtime_library") {
android_stlport_root = "$android_ndk_root/sources/cxx-stl/stlport"
cflags += [
"-I" + rebase_path("$android_stlport_root/stlport", root_build_dir)
"-isystem" + rebase_path("$android_stlport_root/stlport",
root_build_dir)
]
lib_dirs += [ "$android_stlport_root/libs/$android_app_abi" ]
......
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