StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove ConvertWithBp2build implementations

Browse Source 
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:
Colin Cross
2023-12-07 13:10:56 -08:00
parent e51c6e4109
commit 8ff105860d
168 changed files with 64 additions and 39712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xml/Android.bp
View File

@@ -9,7 +9,6 @@ bootstrap_go_package {
"blueprint",
"blueprint-pathtools",
"soong",
"soong-bp2build",
"soong-android",
"soong-etc",
],
@@ -19,7 +18,6 @@ bootstrap_go_package {
],
testSrcs: [
"xml_test.go",
"xml_conversion_test.go",
],
pluginFor: ["soong_build"],
}

42
xml/xml.go
View File

@@ -16,7 +16,6 @@ package xml
import (
"android/soong/android"
"android/soong/bazel"
"android/soong/etc"
"github.com/google/blueprint"
@@ -68,8 +67,6 @@ type prebuiltEtcXmlProperties struct {
}
type prebuiltEtcXml struct {
android.BazelModuleBase
etc.PrebuiltEtc
properties prebuiltEtcXmlProperties
@@ -132,44 +129,5 @@ func PrebuiltEtcXmlFactory() android.Module {
etc.InitPrebuiltEtcModule(&module.PrebuiltEtc, "etc")
// This module is device-only
android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibFirst)
android.InitBazelModule(module)
return module
}
type bazelPrebuiltEtcXmlAttributes struct {
Src bazel.LabelAttribute
Filename bazel.LabelAttribute
Dir string
Installable bazel.BoolAttribute
Filename_from_src bazel.BoolAttribute
Schema *string
}
func (p *prebuiltEtcXml) ConvertWithBp2build(ctx android.Bp2buildMutatorContext) {
baseAttrs, convertible := p.PrebuiltEtc.Bp2buildHelper(ctx)
if !convertible {
return
}
var schema *string
if p.properties.Schema != nil {
schema = p.properties.Schema
}
attrs := &bazelPrebuiltEtcXmlAttributes{
Src: baseAttrs.Src,
Filename: baseAttrs.Filename,
Dir: baseAttrs.Dir,
Installable: baseAttrs.Installable,
Filename_from_src: baseAttrs.Filename_from_src,
Schema: schema,
}
props := bazel.BazelTargetModuleProperties{
Rule_class: "prebuilt_xml",
Bzl_load_location: "//build/bazel/rules/prebuilt_xml.bzl",
}
ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: p.Name()}, attrs)
}

129
xml/xml_conversion_test.go
View File

@@ -1,129 +0,0 @@
// Copyright 2022 Google Inc. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package xml
import (
"android/soong/android"
"android/soong/bp2build"
"testing"
)
func runXmlPrebuiltEtcTestCase(t *testing.T, tc bp2build.Bp2buildTestCase) {
t.Helper()
(&tc).ModuleTypeUnderTest = "prebuilt_etc_xml"
(&tc).ModuleTypeUnderTestFactory = PrebuiltEtcXmlFactory
bp2build.RunBp2BuildTestCase(t, registerXmlModuleTypes, tc)
}
func registerXmlModuleTypes(ctx android.RegistrationContext) {
}
func TestXmlPrebuiltEtcSimple(t *testing.T) {
runXmlPrebuiltEtcTestCase(t, bp2build.Bp2buildTestCase{
Description: "prebuilt_etc_xml - simple example",
Filesystem: map[string]string{},
Blueprint: `
prebuilt_etc_xml {
name: "foo",
src: "fooSrc",
filename: "fooFileName",
sub_dir: "fooDir",
schema: "foo.dtd",
}
`,
ExpectedBazelTargets: []string{
bp2build.MakeBazelTarget("prebuilt_xml", "foo", bp2build.AttrNameToString{
"src": `"fooSrc"`,
"filename": `"fooFileName"`,
"dir": `"etc/fooDir"`,
"schema": `"foo.dtd"`,
})}})
}
func TestXmlPrebuiltEtcFilenameFromSrc(t *testing.T) {
runXmlPrebuiltEtcTestCase(t, bp2build.Bp2buildTestCase{
Description: "prebuilt_etc_xml - filenameFromSrc True ",
Filesystem: map[string]string{},
Blueprint: `
prebuilt_etc_xml {
name: "foo",
src: "fooSrc",
filename_from_src: true,
sub_dir: "fooDir",
schema: "foo.dtd",
}
`,
ExpectedBazelTargets: []string{
bp2build.MakeBazelTarget("prebuilt_xml", "foo", bp2build.AttrNameToString{
"src": `"fooSrc"`,
"filename": `"fooSrc"`,
"dir": `"etc/fooDir"`,
"schema": `"foo.dtd"`,
})}})
}
func TestXmlPrebuiltEtcFilenameAndFilenameFromSrc(t *testing.T) {
runXmlPrebuiltEtcTestCase(t, bp2build.Bp2buildTestCase{
Description: "prebuilt_etc_xml - filename provided and filenameFromSrc True ",
Filesystem: map[string]string{},
Blueprint: `
prebuilt_etc_xml {
name: "foo",
src: "fooSrc",
filename: "fooFileName",
filename_from_src: true,
sub_dir: "fooDir",
schema: "foo.dtd",
}
`,
ExpectedBazelTargets: []string{
bp2build.MakeBazelTarget("prebuilt_xml", "foo", bp2build.AttrNameToString{
"src": `"fooSrc"`,
"filename": `"fooFileName"`,
"dir": `"etc/fooDir"`,
"schema": `"foo.dtd"`,
})}})
}
func TestXmlPrebuiltEtcFileNameFromSrcMultipleSrcs(t *testing.T) {
runXmlPrebuiltEtcTestCase(t, bp2build.Bp2buildTestCase{
Description: "prebuilt_etc - filename_from_src is true but there are multiple srcs",
Filesystem: map[string]string{},
Blueprint: `
prebuilt_etc_xml {
name: "foo",
filename_from_src: true,
arch: {
arm: {
src: "barSrc",
},
arm64: {
src: "bazSrc",
},
}
}
`,
ExpectedBazelTargets: []string{
bp2build.MakeBazelTarget("prebuilt_xml", "foo", bp2build.AttrNameToString{
"filename_from_src": `True`,
"dir": `"etc"`,
"src": `select({
"//build/bazel_common_rules/platforms/arch:arm": "barSrc",
"//build/bazel_common_rules/platforms/arch:arm64": "bazSrc",
"//conditions:default": None,
})`,
})}})
}