From 09f9231e916f12b69e281ec44a9ba77d10151a08 Mon Sep 17 00:00:00 2001 From: Liz Kammer Date: Fri, 2 Apr 2021 11:03:15 -0400 Subject: [PATCH] Remove unused cquery requests. Test: go test soong tests Change-Id: Ie7a72bc73ccf4d9b8aa2a0b20c1674d3a5b499de --- bazel/cquery/request_type.go | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/bazel/cquery/request_type.go b/bazel/cquery/request_type.go index 864db3d2d..bd1ece177 100644 --- a/bazel/cquery/request_type.go +++ b/bazel/cquery/request_type.go @@ -6,7 +6,6 @@ import ( var ( GetOutputFiles RequestType = &getOutputFilesRequestType{} - GetCcObjectFiles RequestType = &getCcObjectFilesRequestType{} GetOutputFilesAndCcObjectFiles RequestType = &getOutputFilesAndCcObjectFilesType{} ) @@ -16,7 +15,9 @@ type GetOutputFilesAndCcObjectFiles_Result struct { } var RequestTypes []RequestType = []RequestType{ - GetOutputFiles, GetCcObjectFiles, GetOutputFilesAndCcObjectFiles} + GetOutputFiles, + GetOutputFilesAndCcObjectFiles, +} type RequestType interface { // Name returns a string name for this request type. Such request type names must be unique, @@ -55,28 +56,6 @@ func (g getOutputFilesRequestType) ParseResult(rawString string) interface{} { return strings.Split(rawString, ", ") } -type getCcObjectFilesRequestType struct{} - -func (g getCcObjectFilesRequestType) Name() string { - return "getCcObjectFiles" -} - -func (g getCcObjectFilesRequestType) StarlarkFunctionBody() string { - return ` -result = [] -linker_inputs = providers(target)["CcInfo"].linking_context.linker_inputs.to_list() - -for linker_input in linker_inputs: - for library in linker_input.libraries: - for object in library.objects: - result += [object.path] -return ', '.join(result)` -} - -func (g getCcObjectFilesRequestType) ParseResult(rawString string) interface{} { - return strings.Split(rawString, ", ") -} - type getOutputFilesAndCcObjectFilesType struct{} func (g getOutputFilesAndCcObjectFilesType) Name() string {