diff options
4 files changed, 10 insertions, 18 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/AndroidNdkCrosstoolsR15.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/AndroidNdkCrosstoolsR15.java index 7a8c0d45c4..f90604dda1 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/AndroidNdkCrosstoolsR15.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/AndroidNdkCrosstoolsR15.java @@ -75,7 +75,7 @@ final class AndroidNdkCrosstoolsR15 { toolchainBuilder.addCxxBuiltinIncludeDirectory( ndkPaths.createBuiltinSysroot() + "/usr/include"); toolchainBuilder.addCompilerFlag( - "-I%ndk%/usr/include".replace("%ndk%", ndkPaths.createBuiltinSysroot())); + "-isystem%ndk%/usr/include".replace("%ndk%", ndkPaths.createBuiltinSysroot())); toolchains.add(toolchainBuilder.build()); } diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/ArmCrosstools.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/ArmCrosstools.java index e9987626d1..699b167639 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/ArmCrosstools.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/ArmCrosstools.java @@ -75,7 +75,7 @@ final class ArmCrosstools { .addCompilerFlag("-Wno-unused-command-line-argument") .addCompilerFlag("-no-canonical-prefixes") .addCompilerFlag( - "-I%ndk%/usr/include/%triple%" + "-isystem%ndk%/usr/include/%triple%" .replace("%ndk%", ndkPaths.createBuiltinSysroot()) .replace("%triple%", targetPlatform)) .addCompilerFlag("-D__ANDROID_API__=" + ndkPaths.getCorrectedApiLevel("arm")) @@ -107,7 +107,6 @@ final class ArmCrosstools { } private List<Builder> createArmeabiClangToolchain() { - String targetPlatform = "arm-linux-androideabi"; ImmutableList<Builder> toolchains = ImmutableList.of( createBaseArmeabiClangToolchain() @@ -118,11 +117,6 @@ final class ArmCrosstools { .addCompilerFlag("-march=armv5te") .addCompilerFlag("-mtune=xscale") .addCompilerFlag("-msoft-float") - .addCompilerFlag( - "-I%ndk%/usr/include/%triple%" - .replace("%ndk%", ndkPaths.createBuiltinSysroot()) - .replace("%triple%", targetPlatform)) - .addCompilerFlag("-D__ANDROID_API__=" + ndkPaths.getCorrectedApiLevel("arm")) .addLinkerFlag("-target") // LLVM_TRIPLE .addLinkerFlag("armv5te-none-linux-androideabi"), @@ -134,11 +128,6 @@ final class ArmCrosstools { .addCompilerFlag("-march=armv7-a") .addCompilerFlag("-mfloat-abi=softfp") .addCompilerFlag("-mfpu=vfpv3-d16") - .addCompilerFlag( - "-I%ndk%/usr/include/%triple%" - .replace("%ndk%", ndkPaths.createBuiltinSysroot()) - .replace("%triple%", targetPlatform)) - .addCompilerFlag("-D__ANDROID_API__=" + ndkPaths.getCorrectedApiLevel("arm")) .addLinkerFlag("-target") .addLinkerFlag("armv7-none-linux-androideabi") // LLVM_TRIPLE .addLinkerFlag("-Wl,--fix-cortex-a8")); @@ -159,6 +148,11 @@ final class ArmCrosstools { .addCxxBuiltinIncludeDirectory( ndkPaths.createClangToolchainBuiltinIncludeDirectory(clangVersion)) .setBuiltinSysroot(ndkPaths.createBuiltinSysroot("arm")) + .addCompilerFlag("-D__ANDROID_API__=" + ndkPaths.getCorrectedApiLevel("arm")) + .addCompilerFlag( + "-isystem%ndk%/usr/include/%triple%" + .replace("%ndk%", ndkPaths.createBuiltinSysroot()) + .replace("%triple%", targetPlatform)) // Compiler flags .addCompilerFlag("-gcc-toolchain") diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/MipsCrosstools.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/MipsCrosstools.java index 8bcaf891d9..66523f52e0 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/MipsCrosstools.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/MipsCrosstools.java @@ -54,7 +54,7 @@ final class MipsCrosstools { ndkPaths.createClangToolpaths( "mips64el-linux-android-4.9", targetPlatform, null, CppConfiguration.Tool.DWP)) .addCompilerFlag( - "-I%ndk%/usr/include/%triple%" + "-isystem%ndk%/usr/include/%triple%" .replace("%ndk%", ndkPaths.createBuiltinSysroot()) .replace("%triple%", targetPlatform)) .addCompilerFlag("-D__ANDROID_API__=" + ndkPaths.getCorrectedApiLevel(targetCpu)) @@ -74,7 +74,7 @@ final class MipsCrosstools { .setTargetSystemName("mipsel-linux-android") .setTargetCpu(targetCpu) .addCompilerFlag( - "-I%ndk%/usr/include/%triple%" + "-isystem%ndk%/usr/include/%triple%" .replace("%ndk%", ndkPaths.createBuiltinSysroot()) .replace("%triple%", targetPlatform)) .addCompilerFlag("-D__ANDROID_API__=" + ndkPaths.getCorrectedApiLevel("mips")) diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/X86Crosstools.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/X86Crosstools.java index b05aa0fd60..1183b4f40f 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/X86Crosstools.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r15/X86Crosstools.java @@ -87,10 +87,8 @@ final class X86Crosstools { .addCompilerFlag("-Wno-invalid-command-line-argument") .addCompilerFlag("-Wno-unused-command-line-argument") .addCompilerFlag("-no-canonical-prefixes") - .addCompilerFlag("-isysroot " + ndkPaths.createBuiltinSysroot()) - .addCompilerFlag("-I%ndk%/usr/include".replace("%ndk%", ndkPaths.createBuiltinSysroot())) .addCompilerFlag( - "-I%ndk%/usr/include/%triple%" + "-isystem%ndk%/usr/include/%triple%" .replace("%ndk%", ndkPaths.createBuiltinSysroot()) .replace("%triple%", triple)) .addCompilerFlag("-D__ANDROID_API__=" + ndkPaths.getCorrectedApiLevel(x86Arch)) |