Remove `CcCompilationOutputs.files_to_compile` and implement its logic in Starlark. The `files_to_compile` method on `CcCompilationOutputs` is no longer needed as its functionality can be expressed directly in Starlark using existing attributes like `objects`, `pic_objects`, and `header_tokens`. This change moves the logic from Java to `cc_helper.bzl`. PiperOrigin-RevId: 805838059 Change-Id: I8c7da56a616ca09003bee8960f9bd8c242a610e9
diff --git a/cc/common/cc_helper.bzl b/cc/common/cc_helper.bzl index a75b45d..715277d 100644 --- a/cc/common/cc_helper.bzl +++ b/cc/common/cc_helper.bzl
@@ -180,19 +180,13 @@ process_hdrs = cpp_configuration.process_headers_in_dependencies() use_pic = cc_toolchain.needs_pic_for_dynamic_libraries(feature_configuration = feature_configuration) output_groups_builder["temp_files_INTERNAL_"] = compilation_outputs.temps() - if hasattr(compilation_outputs, "files_to_compile"): - files_to_compile = compilation_outputs.files_to_compile( - parse_headers = process_hdrs, - use_pic = use_pic, - ) - else: - files_to_compile = compilation_outputs.pic_objects if use_pic else compilation_outputs.objects - if process_hdrs: - if hasattr(compilation_outputs, "header_tokens"): - files_to_compile = files_to_compile + compilation_outputs.header_tokens() - else: - files_to_compile = files_to_compile + compilation_outputs._header_tokens - files_to_compile = depset(files_to_compile) + files_to_compile = compilation_outputs.pic_objects if use_pic else compilation_outputs.objects + if process_hdrs: + if hasattr(compilation_outputs, "header_tokens"): + files_to_compile = files_to_compile + compilation_outputs.header_tokens() + else: + files_to_compile = files_to_compile + compilation_outputs._header_tokens + files_to_compile = depset(files_to_compile) output_groups_builder["compilation_outputs"] = files_to_compile output_groups_builder["compilation_prerequisites_INTERNAL_"] = _collect_compilation_prerequisites(ctx = ctx, compilation_context = compilation_context) if hasattr(compilation_outputs, "module_files"):