commit f6c4b698ac48f743ecef1a9b14eb01380ddf4b9b
author hlopko <hlopko@google.com> Thu Oct 17 04:58:08 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Oct 17 04:59:05 2019 -0700
tree ef29294c3898be20d512c4ec60850df3c9c89ef3
parent 2491ed387044b3af3de656b65cccaf8259d3b411

Fix typo

RELNOTES: None.
PiperOrigin-RevId: 275234136

src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
index c328e0a..9eee0a6 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
@@ -975,7 +975,7 @@
     //   will be gone.
     String sysrootCcFlags =
         computeCcFlagForSysroot(
-            toolchainProvider.getCppConfigurationEvenThoughItCanBeDifferentThatWhatTargetHas(),
+            toolchainProvider.getCppConfigurationEvenThoughItCanBeDifferentThanWhatTargetHas(),
             toolchainProvider);
 
     // Fetch additional flags from the FeatureConfiguration.
@@ -1022,7 +1022,7 @@
       cppConfiguration = ruleContext.getFragment(CppConfiguration.class);
     } else {
       cppConfiguration =
-          toolchainProvider.getCppConfigurationEvenThoughItCanBeDifferentThatWhatTargetHas();
+          toolchainProvider.getCppConfigurationEvenThoughItCanBeDifferentThanWhatTargetHas();
     }
     try {
       featureConfiguration =

src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java
index e182316..0b81241 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java
@@ -141,7 +141,7 @@
     }
     CppConfiguration cppConfiguration =
         ruleContext == null
-            ? toolchain.getCppConfigurationEvenThoughItCanBeDifferentThatWhatTargetHas()
+            ? toolchain.getCppConfigurationEvenThoughItCanBeDifferentThanWhatTargetHas()
             : ruleContext.getRuleContext().getFragment(CppConfiguration.class);
     // buildOptions are only used when --incompatible_enable_cc_toolchain_resolution is flipped,
     // and that will only be flipped when --incompatible_require_ctx_in_configure_features is

src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java
index fb01d90..c8ec462 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java
@@ -525,7 +525,7 @@
   }
 
   public NestedSet<Artifact> getLibcLink(CppConfiguration cppConfiguration) {
-    if (cppConfiguration.equals(getCppConfigurationEvenThoughItCanBeDifferentThatWhatTargetHas())) {
+    if (cppConfiguration.equals(getCppConfigurationEvenThoughItCanBeDifferentThanWhatTargetHas())) {
       return libcLink;
     } else {
       return targetLibcLink;
@@ -696,7 +696,7 @@
    * <p>Once toolchain transitions are implemented, we can safely use the CppConfiguration from the
    * toolchain in rules.
    */
-  CppConfiguration getCppConfigurationEvenThoughItCanBeDifferentThatWhatTargetHas() {
+  CppConfiguration getCppConfigurationEvenThoughItCanBeDifferentThanWhatTargetHas() {
     return cppConfiguration;
   }
 
@@ -727,7 +727,7 @@
    * @param cppConfiguration
    */
   public ImmutableList<Artifact> getBuiltinIncludeFiles(CppConfiguration cppConfiguration) {
-    if (cppConfiguration.equals(getCppConfigurationEvenThoughItCanBeDifferentThatWhatTargetHas())) {
+    if (cppConfiguration.equals(getCppConfigurationEvenThoughItCanBeDifferentThanWhatTargetHas())) {
       return builtinIncludeFiles;
     } else {
       return targetBuiltinIncludeFiles;
@@ -756,7 +756,7 @@
   }
 
   public PathFragment getSysrootPathFragment(CppConfiguration cppConfiguration) {
-    if (cppConfiguration.equals(getCppConfigurationEvenThoughItCanBeDifferentThatWhatTargetHas())) {
+    if (cppConfiguration.equals(getCppConfigurationEvenThoughItCanBeDifferentThanWhatTargetHas())) {
       return sysroot;
     } else {
       return targetSysroot;
@@ -953,7 +953,7 @@
   }
 
   public boolean requireCtxInConfigureFeatures() {
-    return getCppConfigurationEvenThoughItCanBeDifferentThatWhatTargetHas()
+    return getCppConfigurationEvenThoughItCanBeDifferentThanWhatTargetHas()
         .requireCtxInConfigureFeatures();
   }
 

src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionTemplate.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionTemplate.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionTemplate.java
index b0f54ed..f2a63b5 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionTemplate.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionTemplate.java
@@ -172,7 +172,7 @@
         cppCompileActionBuilder.getBuiltinIncludeDirectories(),
         cppCompileActionBuilder.buildInputsForInvalidation(),
         toolchain
-            .getCppConfigurationEvenThoughItCanBeDifferentThatWhatTargetHas()
+            .getCppConfigurationEvenThoughItCanBeDifferentThanWhatTargetHas()
             .validateTopLevelHeaderInclusions());
   }