Skip to content

[DRAFT] allow configuring pipelines via optional toolchain #421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
restingbull wants to merge 1 commit into
base: main
Choose a base branch
from
+62 −19
Draft

[DRAFT] allow configuring pipelines via optional toolchain #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions rules/android_binary/impl.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
# limitations under the License.
"""Implementation."""

load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
load("@rules_java//java/common:java_common.bzl", "java_common")
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
load("@rules_java//java/common:java_plugin_info.bzl", "JavaPluginInfo")
load("//providers:providers.bzl", "AndroidDexInfo", "AndroidFeatureFlagSet", "AndroidIdlInfo", "AndroidInstrumentationInfo", "AndroidLibraryResourceClassJarProvider", "AndroidOptimizationInfo", "AndroidPreDexJarInfo", "ApkInfo", "BaselineProfileProvider", "DataBindingV2Info", "ProguardMappingInfo", "StarlarkAndroidDexInfo", "StarlarkAndroidResourcesInfo", "StarlarkApkInfo")
load("//rules:acls.bzl", "acls")
load("//rules:apk_packaging.bzl", _apk_packaging = "apk_packaging")
Expand All @@ -38,17 +42,14 @@ load("//rules:proguard.bzl", "proguard")
load("//rules:resources.bzl", _resources = "resources")
load(
"//rules:utils.bzl",
"ANDROID_PIPELINE_TOOLCHAIN_TYPE",
"ANDROID_TOOLCHAIN_TYPE",
"compilation_mode",
"get_android_sdk",
"get_android_toolchain",
"utils",
)
load("//rules:visibility.bzl", "PROJECT_VISIBILITY")
load("@rules_java//java/common:java_common.bzl", "java_common")
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
load("@rules_java//java/common:java_plugin_info.bzl", "JavaPluginInfo")
load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
load(":r8.bzl", "process_r8", "process_resource_shrinking_r8")

visibility(PROJECT_VISIBILITY)
Expand Down Expand Up @@ -1100,7 +1101,7 @@ PROCESSORS = dict(
CoverageProcessor = _process_coverage,
)

_PROCESSING_PIPELINE = processing_pipeline.make_processing_pipeline(
PROCESSING_PIPELINE = processing_pipeline.make_processing_pipeline(
processors = PROCESSORS,
finalize = finalize,
)
Expand All @@ -1115,4 +1116,8 @@ def impl(ctx):
A list of providers.
"""
java_package = java.resolve_package_from_label(ctx.label, ctx.attr.custom_package)
return processing_pipeline.run(ctx, java_package, _PROCESSING_PIPELINE)
pipeline = PROCESSING_PIPELINE
tt = ctx.toolchains[ANDROID_PIPELINE_TOOLCHAIN_TYPE]
if tt:
pipeline = tt.binary
return processing_pipeline.run(ctx, java_package, pipeline)
10 changes: 7 additions & 3 deletions rules/android_binary/rule.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
# limitations under the License.
"""Starlark Android Binary for Android Rules."""

load("@rules_java//java/common:java_info.bzl", "JavaInfo")
load("//providers:providers.bzl", "ApkInfo")
load("//rules:acls.bzl", "acls")
load(
"//rules:attrs.bzl",
_attrs = "attrs",
)
load("//rules:utils.bzl", "ANDROID_SDK_TOOLCHAIN_TYPE")
load("//rules:utils.bzl", "ANDROID_PIPELINE_TOOLCHAIN_TYPE", "ANDROID_SDK_TOOLCHAIN_TYPE", "ANDROID_TOOLCHAIN_TYPE")
load("//rules:visibility.bzl", "PROJECT_VISIBILITY")
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
load(":attrs.bzl", "ATTRS")
load(":impl.bzl", "impl")

Expand Down Expand Up @@ -74,7 +74,11 @@ def make_rule(
implementation = implementation,
provides = provides,
toolchains = [
"//toolchains/android:toolchain_type",
config_common.toolchain_type(
ANDROID_PIPELINE_TOOLCHAIN_TYPE,
mandatory = False,
),
ANDROID_TOOLCHAIN_TYPE,
ANDROID_SDK_TOOLCHAIN_TYPE,
"@bazel_tools//tools/jdk:toolchain_type",
] + additional_toolchains,
Expand Down
20 changes: 12 additions & 8 deletions rules/android_library/impl.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@
# limitations under the License.
"""Implementation."""

load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
Copy link
Author

@restingbull restingbull Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm. buildifier got enthusiastic.

load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
load("@rules_java//java/common:java_plugin_info.bzl", "JavaPluginInfo")
load("@rules_java//java/common:proguard_spec_info.bzl", "ProguardSpecInfo")
load("//providers:providers.bzl", "AndroidCcLinkParamsInfo", "AndroidIdlInfo", "AndroidLibraryAarInfo", "AndroidLintRulesInfo", "AndroidNativeLibsInfo", "BaselineProfileProvider", "DataBindingV2Info", "StarlarkAndroidResourcesInfo", "StarlarkApkInfo")
load("//rules:acls.bzl", "acls")
load("//rules:attrs.bzl", _attrs = "attrs")
Expand All @@ -28,14 +33,9 @@ load(
)
load("//rules:proguard.bzl", _proguard = "proguard")
load("//rules:resources.bzl", _resources = "resources")
load("//rules:utils.bzl", "get_android_sdk", "get_android_toolchain", "log", "utils")
load("//rules:utils.bzl", "ANDROID_PIPELINE_TOOLCHAIN_TYPE", "get_android_sdk", "get_android_toolchain", "log", "utils")
load("//rules:visibility.bzl", "PROJECT_VISIBILITY")
load("//rules/flags:flags.bzl", _flags = "flags")
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
load("@rules_java//java/common:java_plugin_info.bzl", "JavaPluginInfo")
load("@rules_java//java/common:proguard_spec_info.bzl", "ProguardSpecInfo")

visibility(PROJECT_VISIBILITY)

Expand Down Expand Up @@ -585,7 +585,7 @@ def finalize(
])
return providers

_PROCESSING_PIPELINE = processing_pipeline.make_processing_pipeline(
PROCESSING_PIPELINE = processing_pipeline.make_processing_pipeline(
processors = PROCESSORS,
finalize = finalize,
)
Expand All @@ -600,4 +600,8 @@ def impl(ctx):
A legacy struct provider.
"""
java_package = _java.resolve_package_from_label(ctx.label, ctx.attr.custom_package)
return processing_pipeline.run(ctx, java_package, _PROCESSING_PIPELINE)
pipeline = PROCESSING_PIPELINE
tt = ctx.toolchains[ANDROID_PIPELINE_TOOLCHAIN_TYPE]
if tt:
pipeline = tt.library
return processing_pipeline.run(ctx, java_package, pipeline)
8 changes: 6 additions & 2 deletions rules/android_library/rule.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
# limitations under the License.
"""android_library rule."""

load("@rules_java//java/common:java_info.bzl", "JavaInfo")
load("//providers:providers.bzl", "AndroidCcLinkParamsInfo", "AndroidIdeInfo", "AndroidIdlInfo", "AndroidLibraryResourceClassJarProvider", "AndroidNativeLibsInfo")
load(
"//rules:attrs.bzl",
_attrs = "attrs",
)
load("//rules:utils.bzl", "ANDROID_SDK_TOOLCHAIN_TYPE")
load("//rules:utils.bzl", "ANDROID_PIPELINE_TOOLCHAIN_TYPE", "ANDROID_SDK_TOOLCHAIN_TYPE")
load("//rules:visibility.bzl", "PROJECT_VISIBILITY")
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
load(":attrs.bzl", _ATTRS = "ATTRS")
load(":impl.bzl", _impl = "impl")

Expand Down Expand Up @@ -172,6 +172,10 @@ def make_rule(
toolchains = [
"//toolchains/android:toolchain_type",
"@bazel_tools//tools/jdk:toolchain_type",
config_common.toolchain_type(
ANDROID_PIPELINE_TOOLCHAIN_TYPE,
mandatory = False,
),
ANDROID_SDK_TOOLCHAIN_TYPE,
] + additional_toolchains,
_skylark_testable = True,
Expand Down
1 change: 1 addition & 0 deletions rules/utils.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ visibility(PROJECT_VISIBILITY)

ANDROID_TOOLCHAIN_TYPE = Label("//toolchains/android:toolchain_type")
ANDROID_SDK_TOOLCHAIN_TYPE = Label("//toolchains/android_sdk:toolchain_type")
ANDROID_PIPELINE_TOOLCHAIN_TYPE = Label("//toolchains/pipeline:toolchain_type")

_CUU = "\033[A"
_EL = "\033[K"
Expand Down
4 changes: 4 additions & 0 deletions toolchains/pipeline/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
toolchain_type(
name = "toolchain_type",
visibility = ["//visibility:public"],
)
21 changes: 21 additions & 0 deletions toolchains/pipeline/toolchain.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
load(
"//rules/android_binary:impl.bzl",
binary_pipeline = "PROCESSING_PIPELINE",
)
load(
"//rules/android_library:impl.bzl",
library_pipeline = "PROCESSING_PIPELINE",
)

def _impl(ctx):
return [
platform_common.ToolchainInfo(
library = library_pipeline,
binary = binary_pipeline,
),
]

android_toolchain = rule(
implementation = _impl,
attrs = {},
)