Add new flag to specify if output_licenses attribute should be checked for licenses.

Also flipped :jvm attribute from HOST to TARGET and set the new flag on it.

--
PiperOrigin-RevId: 144084000
MOS_MIGRATED_REVID=144084000

1 files changed, 15 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java
index 5ff24aa753..494e74ecf1 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java
@@ -237,7 +237,10 @@ public class CcToolchain implements RuleConfiguredTargetFactory {
     // but it is sort-of-kind-of a tool, but various parts of it are linked into the output...
     // ...so we trust the judgment of the author of the cc_toolchain rule to figure out what
     // licenses should be propagated to C++ targets.
-    License outputLicense = ruleContext.getRule().getToolOutputLicense(ruleContext.attributes());
+    // TODO(elenairina): Remove this and use Attribute.Builder.useOutputLicenses() on the
+    // :cc_toolchain attribute instead.
+    final License outputLicense =
+        ruleContext.getRule().getToolOutputLicense(ruleContext.attributes());
     if (outputLicense != null && outputLicense != License.NO_LICENSE) {
       final NestedSet<TargetLicense> license = NestedSetBuilder.create(Order.STABLE_ORDER,
           new TargetLicense(ruleContext.getLabel(), outputLicense));
@@ -246,6 +249,17 @@ public class CcToolchain implements RuleConfiguredTargetFactory {
         public NestedSet<TargetLicense> getTransitiveLicenses() {
           return license;
         }
+
+        @Override
+        public TargetLicense getOutputLicenses() {
+          return new TargetLicense(label, outputLicense);
+        }
+
+        @Override
+        public boolean hasOutputLicenses() {
+          return true;
+        }
+
       };
 
       builder.add(LicensesProvider.class, licensesProvider);