Remove ConvertWithBp2build implementations
Remove the ConvertWithBp2build implementations from all the module types, along with the related code. Bug: 315353489 Test: m blueprint_tests Change-Id: I212672286686a318893bc7348ddd5a5ec51e77a7
This commit is contained in:
33
cc/rs.go
33
cc/rs.go
@@ -20,7 +20,6 @@ import (
|
||||
"strings"
|
||||
|
||||
"android/soong/android"
|
||||
"android/soong/bazel"
|
||||
"github.com/google/blueprint"
|
||||
)
|
||||
|
||||
@@ -134,35 +133,3 @@ func rsFlags(ctx ModuleContext, flags Flags, properties *BaseCompilerProperties)
|
||||
|
||||
return flags
|
||||
}
|
||||
|
||||
type rscriptAttributes struct {
|
||||
// Renderscript source files
|
||||
Srcs bazel.LabelListAttribute
|
||||
}
|
||||
|
||||
func bp2buildRScript(ctx android.Bp2buildMutatorContext, m *Module, ca compilerAttributes) (bazel.LabelAttribute, bazel.StringListAttribute, bazel.StringListAttribute) {
|
||||
var rscriptAttrs rscriptAttributes
|
||||
var rsAbsIncludes bazel.StringListAttribute
|
||||
var localIncludes bazel.StringListAttribute
|
||||
var rsModuleName string
|
||||
var convertedRsSrcsLabel bazel.LabelAttribute
|
||||
|
||||
if !ca.rscriptSrcs.IsEmpty() {
|
||||
rscriptAttrs.Srcs = ca.rscriptSrcs
|
||||
rsModuleName = m.Name() + "_renderscript"
|
||||
|
||||
localIncludes.Value = []string{"."}
|
||||
rsAbsIncludes.Value = []string{"frameworks/rs", "frameworks/rs/cpp"}
|
||||
convertedRsSrcsLabel = bazel.LabelAttribute{Value: &bazel.Label{Label: rsModuleName}}
|
||||
|
||||
ctx.CreateBazelTargetModule(
|
||||
bazel.BazelTargetModuleProperties{
|
||||
Rule_class: "rscript_to_cpp",
|
||||
Bzl_load_location: "//build/bazel/rules/cc:rscript_to_cpp.bzl",
|
||||
},
|
||||
android.CommonAttributes{Name: rsModuleName},
|
||||
&rscriptAttrs)
|
||||
}
|
||||
|
||||
return convertedRsSrcsLabel, rsAbsIncludes, localIncludes
|
||||
}
|
||||
|
Reference in New Issue
Block a user