diff options
author | Han-Wen Nienhuys <hanwen@google.com> | 2015-06-11 13:48:01 +0000 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2015-06-11 14:48:13 +0000 |
commit | 8d4e6578678cc03239c68681483decec9abc3d39 (patch) | |
tree | 8e8b66ea6dc0b54dbab238cc334babcffb8f89f4 /src/main/java | |
parent | 6f60d2dbef1ada26b844602f96afb089a0aa7e25 (diff) |
Cosmetic fixes in rules/cpp/ .
--
MOS_MIGRATED_REVID=95734020
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java | 2 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java index b530e9a04e..bf889ca85c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java @@ -767,7 +767,7 @@ public final class CcLibraryHelper { if (model.getGeneratesPicHeaderModule()) { contextBuilder.setPicHeaderModule(model.getPicHeaderModule(cppModuleMap.getArtifact())); } - if (model.getGeratesNoPicHeaderModule()) { + if (model.getGeneratesNoPicHeaderModule()) { contextBuilder.setHeaderModule(model.getHeaderModule(cppModuleMap.getArtifact())); } } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java index 004662da62..08683fd4e0 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java @@ -239,14 +239,14 @@ public final class CppModel { /** * @return whether this target needs to generate pic actions. */ - public boolean getGeneratePicActions() { + private boolean getGeneratePicActions() { return CppHelper.usePic(ruleContext, false); } /** * @return whether this target needs to generate non-pic actions. */ - public boolean getGenerateNoPicActions() { + private boolean getGenerateNoPicActions() { return // If we always need pic for everything, then don't bother to create a no-pic action. (!CppHelper.usePic(ruleContext, true) || !CppHelper.usePic(ruleContext, false)) @@ -267,7 +267,7 @@ public final class CppModel { /** * @return whether this target needs to generate a non-pic header module. */ - public boolean getGeratesNoPicHeaderModule() { + public boolean getGeneratesNoPicHeaderModule() { return featureConfiguration.isEnabled(CppRuleClasses.HEADER_MODULES) && !fake && getGenerateNoPicActions(); } |