Implicit outputs to cc_library are also exported in unique output groups.

--
MOS_MIGRATED_REVID=126405595

1 files changed, 6 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java
index 7c9aa05675..0736c0b9b9 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java
@@ -38,6 +38,7 @@ import com.google.devtools.build.lib.packages.AttributeMap;
 import com.google.devtools.build.lib.packages.ImplicitOutputsFunction.SafeImplicitOutputsFunction;
 import com.google.devtools.build.lib.packages.Rule;
 import com.google.devtools.build.lib.rules.test.InstrumentedFilesCollector.InstrumentationSpec;
+import com.google.devtools.build.lib.syntax.Type;
 import com.google.devtools.build.lib.util.FileTypeSet;
 import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.LipoMode;
 
@@ -46,6 +47,11 @@ import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.LipoM
  */
 public class CppRuleClasses {
 
+  /** Returns true if this rule should create a dynamic library. */
+  public static boolean shouldCreateDynamicLibrary(AttributeMap rule) {
+    return !rule.get("linkstatic", Type.BOOLEAN) && CcLibrary.appearsToHaveObjectFiles(rule);
+  }
+
   /**
    * Implementation for the :lipo_context_collector attribute.
    */