[7.1.0] Emit labels in display form in Java rules (#21395)
Buildozer fixes for Java strict deps violations referring to external repositories now contain labels in display form, which avoid canonical repository names that should never be added to BUILD files and aren't understood by `buildozer`. The Starlark actions can use `Label.to_display_form()`. Java compilation actions, which are still implemented in Java, can't access the main repository mapping via `BazelModuleContext` and instead retrieve it from a new field on `AnalysisEnvironment`. Closes #21180. Commit https://github.com/bazelbuild/bazel/commit/b11fa7a7c7fdb37012c7a442b16f6fdcf90b9177 PiperOrigin-RevId: 607803030 Change-Id: I0cdccabfde0217c9201cef9ca9d260b0c8ca27cd --------- Co-authored-by:Fabian Meumertzheim <fabian@meumertzhe.im> Co-authored-by:
hvadehra <hvd@google.com>
Showing
- src/main/java/com/google/devtools/build/lib/analysis/AnalysisEnvironment.java 7 additions, 0 deletions...ogle/devtools/build/lib/analysis/AnalysisEnvironment.java
- src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java 11 additions, 1 deletion...vtools/build/lib/analysis/CachingAnalysisEnvironment.java
- src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java 6 additions, 0 deletions...a/com/google/devtools/build/lib/analysis/RuleContext.java
- src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java 33 additions, 0 deletions.../devtools/build/lib/rules/java/JavaCompilationHelper.java
- src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileActionBuilder.java 7 additions, 8 deletions...vtools/build/lib/rules/java/JavaCompileActionBuilder.java
- src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileAction.java 7 additions, 8 deletions...evtools/build/lib/rules/java/JavaHeaderCompileAction.java
- src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java 13 additions, 1 deletion...om/google/devtools/build/lib/skyframe/AspectFunction.java
- src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java 12 additions, 1 deletion...devtools/build/lib/skyframe/ConfiguredTargetFunction.java
- src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java 5 additions, 2 deletions...google/devtools/build/lib/skyframe/SkyframeBuildView.java
- src/main/starlark/builtins_bzl/common/java/android_lint.bzl 2 additions, 1 deletionsrc/main/starlark/builtins_bzl/common/java/android_lint.bzl
- src/main/starlark/builtins_bzl/common/java/java_common.bzl 1 addition, 1 deletionsrc/main/starlark/builtins_bzl/common/java/java_common.bzl
- src/main/starlark/builtins_bzl/common/java/java_common_internal_for_builtins.bzl 1 addition, 1 deletion...ins_bzl/common/java/java_common_internal_for_builtins.bzl
- src/main/starlark/builtins_bzl/common/java/java_helper.bzl 12 additions, 0 deletionssrc/main/starlark/builtins_bzl/common/java/java_helper.bzl
- src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java 11 additions, 0 deletions...le/devtools/build/lib/analysis/util/AnalysisTestUtil.java
- src/test/java/com/google/devtools/build/lib/analysis/util/BUILD 1 addition, 0 deletions...st/java/com/google/devtools/build/lib/analysis/util/BUILD
- src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java 8 additions, 1 deletion...devtools/build/lib/analysis/util/BuildViewForTesting.java
- src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java 15 additions, 3 deletions...e/devtools/build/lib/analysis/util/BuildViewTestCase.java
- src/test/java/com/google/devtools/build/lib/rules/android/BUILD 1 addition, 0 deletions...st/java/com/google/devtools/build/lib/rules/android/BUILD
- src/test/java/com/google/devtools/build/lib/rules/android/ResourceTestBase.java 8 additions, 1 deletion...le/devtools/build/lib/rules/android/ResourceTestBase.java
- src/test/shell/bazel/BUILD 14 additions, 2 deletionssrc/test/shell/bazel/BUILD
Please register or sign in to comment