Remove legacy process_starlark method, put this functionality directly in process. Cleans up some unused parameters that were never passed to the underlying process_starlark method. PiperOrigin-RevId: 911603140 Change-Id: Iba8c67714cf73e80ab87f159a3eafb384cc0d159
diff --git a/rules/aar_import/impl.bzl b/rules/aar_import/impl.bzl index f90a4ad..3d491d9 100644 --- a/rules/aar_import/impl.bzl +++ b/rules/aar_import/impl.bzl
@@ -152,7 +152,7 @@ aar_resources_extractor_tool, ) - resources_ctx = _resources.process_starlark( + resources_ctx = _resources.process( ctx, manifest = manifest, assets = [assets], @@ -183,7 +183,7 @@ </manifest> """ % package) - return struct(**resources_ctx) + return resources_ctx def _extract_jars( ctx,
diff --git a/rules/android_library/impl.bzl b/rules/android_library/impl.bzl index 0c8683a..6a3c740 100644 --- a/rules/android_library/impl.bzl +++ b/rules/android_library/impl.bzl
@@ -31,7 +31,6 @@ load("//rules:resources.bzl", _resources = "resources") load("//rules:utils.bzl", "get_android_sdk", "get_android_toolchain", "log", "utils") load("//rules:visibility.bzl", "PROJECT_VISIBILITY") -load("//rules/flags:flags.bzl", _flags = "flags") 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") @@ -168,7 +167,6 @@ assets_dir = ctx.attr.assets_dir, exports_manifest = exports_manifest, java_package = java_package, - custom_package = ctx.attr.custom_package, neverlink = ctx.attr.neverlink, enable_data_binding = ctx.attr.enable_data_binding, deps = ctx.attr.deps, @@ -176,8 +174,6 @@ exports = ctx.attr.exports, feature_flags = acls.get_aapt2_feature_flags(str(ctx.label)), - # Processing behavior changing flags. - enable_res_v3 = _flags.get(ctx).android_enable_res_v3, # TODO(b/144163743): remove fix_resource_transitivity, which was only added to emulate # misbehavior on the Java side. fix_resource_transitivity = bool(ctx.attr.srcs), @@ -190,12 +186,6 @@ java_toolchain = _common.get_java_toolchain(ctx), host_javabase = _common.get_host_javabase(ctx), instrument_xslt = utils.only(get_android_toolchain(ctx).add_g3itr_xslt.files.to_list()), - res_v3_dummy_manifest = utils.only( - get_android_toolchain(ctx).res_v3_dummy_manifest.files.to_list(), - ), - res_v3_dummy_r_txt = utils.only( - get_android_toolchain(ctx).res_v3_dummy_r_txt.files.to_list(), - ), xsltproc = get_android_toolchain(ctx).xsltproc_tool.files_to_run, zip_tool = get_android_toolchain(ctx).zip_tool.files_to_run, )
diff --git a/rules/resources.bzl b/rules/resources.bzl index c19b8b8..97ad6b6 100644 --- a/rules/resources.bzl +++ b/rules/resources.bzl
@@ -1189,7 +1189,7 @@ return output -def _process_starlark( +def _process( ctx, java_package = None, manifest = None, @@ -1271,7 +1271,7 @@ zip_tool: FilesToRunProvider. The zip tool executable or FilesToRunProvider. Returns: - A dict containing _ResourcesProcessContextInfo provider fields. + A _ResourcesProcessContextInfo. """ if (xsltproc and not instrument_xslt) or (not xsltproc and instrument_xslt): fail( @@ -1305,6 +1305,7 @@ # TODO(b/156530953): Move the validation result to the validation_outputs list when we are # done rolling out Starlark resources processing _VALIDATION_RESULTS: [], + _VALIDATION_OUTPUTS: [], _DEFINES_RESOURCES: defines_resources, _R_JAVA: None, _DATA_BINDING_LAYOUT_INFO: None, @@ -1801,71 +1802,7 @@ ), ) - return resources_ctx - -def _process( - ctx, - manifest = None, - resource_files = None, - defined_assets = False, - assets = None, - defined_assets_dir = False, - assets_dir = None, - exports_manifest = False, - java_package = None, - custom_package = None, - neverlink = False, - enable_data_binding = False, - deps = [], - resource_apks = [], - exports = [], - feature_flags = "", - android_jar = None, - android_kit = None, - aapt = None, - busybox = None, - xsltproc = None, - instrument_xslt = None, - java_toolchain = None, - host_javabase = None, - enable_res_v3 = False, - res_v3_dummy_manifest = None, - res_v3_dummy_r_txt = None, - fix_resource_transitivity = False, - zip_tool = None): - out_ctx = _process_starlark( - ctx, - java_package = java_package, - manifest = manifest, - defined_assets = defined_assets, - assets = assets, - defined_assets_dir = defined_assets_dir, - assets_dir = assets_dir, - exports_manifest = exports_manifest, - stamp_manifest = True if java_package else False, - deps = deps, - resource_apks = resource_apks, - exports = exports, - feature_flags = feature_flags, - resource_files = resource_files, - enable_data_binding = enable_data_binding, - fix_resource_transitivity = fix_resource_transitivity, - neverlink = neverlink, - android_jar = android_jar, - aapt = aapt, - android_kit = android_kit, - busybox = busybox, - instrument_xslt = instrument_xslt, - xsltproc = xsltproc, - java_toolchain = java_toolchain, - host_javabase = host_javabase, - zip_tool = zip_tool, - ) - - if _VALIDATION_OUTPUTS not in out_ctx: - out_ctx[_VALIDATION_OUTPUTS] = [] - - return _ResourcesProcessContextInfo(**out_ctx) + return _ResourcesProcessContextInfo(**resources_ctx) def _shrink( ctx, @@ -2047,7 +1984,6 @@ resources = struct( process = _process, - process_starlark = _process_starlark, package = _package, make_aar = _make_aar,
diff --git a/test/rules/resources/test.bzl b/test/rules/resources/test.bzl index 1cabb2e..6fdec01 100644 --- a/test/rules/resources/test.bzl +++ b/test/rules/resources/test.bzl
@@ -44,9 +44,9 @@ _StarlarkResourcesTestingInfo = provider() -def _starlark_process_impl(ctx): +def _process_impl(ctx): java_package = _java.resolve_package_from_label(ctx.label, ctx.attr.custom_package) - starlark_resources_ctx = _resources.process_starlark( + starlark_resources_ctx = _resources.process( ctx, java_package = java_package if ctx.attr.use_java_package else None, manifest = ctx.file.manifest, @@ -72,19 +72,19 @@ zip_tool = get_android_toolchain(ctx).zip_tool.files_to_run, ) - validation_results = starlark_resources_ctx["validation_results"] - if starlark_resources_ctx["resources_apk"]: - validation_results.append(starlark_resources_ctx["resources_apk"]) + validation_results = starlark_resources_ctx.validation_results + if starlark_resources_ctx.resources_apk: + validation_results.append(starlark_resources_ctx.resources_apk) - return starlark_resources_ctx["providers"] + [ + return starlark_resources_ctx.providers + [ OutputGroupInfo(_validation = validation_results), _StarlarkResourcesTestingInfo( - r_java = starlark_resources_ctx["r_java"], + r_java = starlark_resources_ctx.r_java, ), ] starlark_process = rule( - implementation = _starlark_process_impl, + implementation = _process_impl, attrs = dict( stamp_manifest = attr.bool( default = True,