diff options
| -rw-r--r-- | build/common.gypi | 12 | ||||
| -rw-r--r-- | build/config/compiler/BUILD.gn | 3 |
2 files changed, 3 insertions, 12 deletions
diff --git a/build/common.gypi b/build/common.gypi index 29d8c1c..0db92c8 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -3824,16 +3824,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)', @@ -4462,7 +4452,7 @@ ], }, { # else: use_system_stlport!=1 'cflags': [ - '-I<(android_stlport_include)', + '-isystem<(android_stlport_include)', ], 'ldflags': [ '-L<(android_stlport_libs_dir)', diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn index 42f6035..aa66b89 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -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" ] |