commit f8d1f96919e30daed1cf6318ea77f9d5fa104f53
author plf <plf@google.com> Mon Apr 29 03:12:25 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Apr 29 03:13:38 2019 -0700
tree 28c041011ed62abc06bdb5f82c7324675312f85b
parent a6abef691fbb5f52f3c3d397d06f3ad489a1acb3

C++: Fixes API not working with aspects

RELNOTES:none
PiperOrigin-RevId: 245715537

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

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcModule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcModule.java
index d486fd5..4d22310 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcModule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcModule.java
@@ -140,7 +140,7 @@
     CcToolchainProvider ccToolchainProvider = convertFromNoneable(skylarkCcToolchainProvider, null);
     FeatureConfigurationForStarlark featureConfiguration =
         convertFromNoneable(skylarkFeatureConfiguration, null);
-    Label label = getCallerLabel(location, environment, name);
+    Label label = getCallerLabel(location, actions, name);
     FdoContext fdoContext = ccToolchainProvider.getFdoContext();
     LinkTargetType dynamicLinkTargetType = null;
     if (language.equals(Language.CPP.getRepresentation())) {

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 5dd6edd..f6de882 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
@@ -1358,7 +1358,7 @@
     CcToolchainProvider ccToolchainProvider = convertFromNoneable(skylarkCcToolchainProvider, null);
     FeatureConfigurationForStarlark featureConfiguration =
         convertFromNoneable(skylarkFeatureConfiguration, null);
-    Label label = getCallerLabel(location, environment, name);
+    Label label = getCallerLabel(location, actions, name);
     FdoContext fdoContext = ccToolchainProvider.getFdoContext();
     LinkTargetType staticLinkTargetType = null;
     if (language.equals(Language.CPP.getRepresentation())) {
@@ -1439,11 +1439,14 @@
     }
   }
 
-  protected Label getCallerLabel(Location location, Environment environment, String name)
+  protected Label getCallerLabel(Location location, SkylarkActionFactory actions, String name)
       throws EvalException {
     Label label;
     try {
-      label = Label.create(environment.getCallerLabel().getPackageName(), name);
+      label =
+          Label.create(
+              actions.getActionConstructionContext().getActionOwner().getLabel().getPackageName(),
+              name);
     } catch (LabelSyntaxException e) {
       throw new EvalException(location, e);
     }
@@ -1479,7 +1482,7 @@
     CcToolchainProvider ccToolchainProvider = convertFromNoneable(skylarkCcToolchainProvider, null);
     FeatureConfigurationForStarlark featureConfiguration =
         convertFromNoneable(skylarkFeatureConfiguration, null);
-    Label label = getCallerLabel(location, environment, name);
+    Label label = getCallerLabel(location, actions, name);
     FdoContext fdoContext = ccToolchainProvider.getFdoContext();
     CcCompilationHelper helper =
         new CcCompilationHelper(
@@ -1552,7 +1555,7 @@
     CcToolchainProvider ccToolchainProvider = convertFromNoneable(skylarkCcToolchainProvider, null);
     FeatureConfigurationForStarlark featureConfiguration =
         convertFromNoneable(skylarkFeatureConfiguration, null);
-    Label label = getCallerLabel(location, environment, name);
+    Label label = getCallerLabel(location, actions, name);
     FdoContext fdoContext = ccToolchainProvider.getFdoContext();
     LinkTargetType dynamicLinkTargetType = null;
     if (language.equals(Language.CPP.getRepresentation())) {