Add the --sysroot argument even if it is the default for the particular Crosstool.

This makes integrating Bazel with an external Android NDK less complex, and removes a special-case from the behavior of Bazel, which is always good.

--
MOS_MIGRATED_REVID=94893919

1 files changed, 1 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
index 10ba9c8f37..78570210b0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
@@ -561,8 +561,7 @@ public class CppConfiguration extends BuildConfiguration.Fragment {
     runtimeSysroot = defaultSysroot;
 
     String sysrootFlag;
-    if (sysroot != null && !sysroot.equals(defaultSysroot)) {
-      // Only specify the --sysroot option if it is different from the built-in one.
+    if (sysroot != null) {
       sysrootFlag = "--sysroot=" + sysroot;
     } else {
       sysrootFlag = null;