Crosstool compilation support for J2ObjcAspect.

Note that I also have to make some changes to cpp files to add the ability to specify a suffix for linked artifacts. This helps to avoid an artifact conflict between proto_library and J2ObjcAspect acting on proto_library, where both will create an archive file. J2ObjcAspect will simply generate a "_j2objc.a" archive instead of ".a" archive.

--
PiperOrigin-RevId: 148135630
MOS_MIGRATED_REVID=148135630

1 files changed, 8 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
index befcb82e13..92df63420e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
@@ -344,9 +344,16 @@ public class CppHelper {
 
   /** Returns the linked artifact for linux. */
   public static Artifact getLinuxLinkedArtifact(RuleContext ruleContext, LinkTargetType linkType) {
+    return getLinuxLinkedArtifact(ruleContext, linkType, "");
+  }
+
+  /** Returns the linked artifact with the given suffix for linux. */
+  public static Artifact getLinuxLinkedArtifact(RuleContext ruleContext, LinkTargetType linkType,
+      String linkedArtifactNameSuffix) {
     PathFragment name = new PathFragment(ruleContext.getLabel().getName());
     if (linkType != LinkTargetType.EXECUTABLE) {
-      name = name.replaceName("lib" + name.getBaseName() + linkType.getExtension());
+      name = name.replaceName(
+          "lib" + name.getBaseName() + linkedArtifactNameSuffix  + linkType.getExtension());
     }
 
     return ruleContext.getBinArtifact(name);