tree e29d69b7d5d8ec230cbbc00df3dfb9b2edfbdc6b
parent d83743e86c509c6cd4733c3c763f94fb6defcdbf
author Adam Michael <ajmichael@google.com> 1489113621 +0000
committer Yue Gan <yueg@google.com> 1489484459 +0100

Add the appropriate cxx_builtin_include_directory entries for clang to the Android NDK crosstool created by android_ndk_repository.

Also, stop setting -isystem for the builtin include directories in the clang toolchains. Previously, we were incorrectly setting cxx_builtin_include_directory for clang toolchains to the gcc include directories. We were also setting -isystem on these directories, so when an Android build attempted to include an NDK header (like arm_neon.h), clang got gcc's version of that header.

A followup change will stop setting -isystem for gcc.

Fixes https://github.com/bazelbuild/bazel/issues/2601.

Note that I intentionally did not attempt to fix the bug for NDK10. NDK10 is very old, defaults to GCC and contains two separate clang/LLVMs. As such, it would be more complicated to get right and test properly.

Also adds an integration test that attempts to compile an NDK header with clang.

This change does not entirely fix Tensorflow's Android sample app build with NDK13 (the motivation for https://github.com/bazelbuild/bazel/issues/2601), however I believe that the remaining fixes are on Tensorflow's side. E.g. setting -Wno-c++11-narrowing in copts.

--
PiperOrigin-RevId: 149719100
MOS_MIGRATED_REVID=149719100