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:
@@ -17,8 +17,6 @@ package bp2build
|
||||
import (
|
||||
"sort"
|
||||
"testing"
|
||||
|
||||
"android/soong/android"
|
||||
)
|
||||
|
||||
type bazelFilepath struct {
|
||||
@@ -80,148 +78,3 @@ func TestCreateBazelFiles_QueryView_AddsTopLevelFiles(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestCreateBazelFiles_Bp2Build_CreatesDefaultFiles(t *testing.T) {
|
||||
testConfig := android.TestConfig("", make(map[string]string), "", make(map[string][]byte))
|
||||
codegenCtx := NewCodegenContext(testConfig, android.NewTestContext(testConfig).Context, Bp2Build, "")
|
||||
files, err := createSoongInjectionDirFiles(codegenCtx, CreateCodegenMetrics())
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
expectedFilePaths := []bazelFilepath{
|
||||
{
|
||||
dir: "android",
|
||||
basename: GeneratedBuildFileName,
|
||||
},
|
||||
{
|
||||
dir: "android",
|
||||
basename: "constants.bzl",
|
||||
},
|
||||
{
|
||||
dir: "cc_toolchain",
|
||||
basename: GeneratedBuildFileName,
|
||||
},
|
||||
{
|
||||
dir: "cc_toolchain",
|
||||
basename: "config_constants.bzl",
|
||||
},
|
||||
{
|
||||
dir: "cc_toolchain",
|
||||
basename: "sanitizer_constants.bzl",
|
||||
},
|
||||
{
|
||||
dir: "java_toolchain",
|
||||
basename: GeneratedBuildFileName,
|
||||
},
|
||||
{
|
||||
dir: "java_toolchain",
|
||||
basename: "constants.bzl",
|
||||
},
|
||||
{
|
||||
dir: "rust_toolchain",
|
||||
basename: GeneratedBuildFileName,
|
||||
},
|
||||
{
|
||||
dir: "rust_toolchain",
|
||||
basename: "constants.bzl",
|
||||
},
|
||||
{
|
||||
dir: "apex_toolchain",
|
||||
basename: GeneratedBuildFileName,
|
||||
},
|
||||
{
|
||||
dir: "apex_toolchain",
|
||||
basename: "constants.bzl",
|
||||
},
|
||||
{
|
||||
dir: "metrics",
|
||||
basename: "converted_modules.json",
|
||||
},
|
||||
{
|
||||
dir: "metrics",
|
||||
basename: "BUILD.bazel",
|
||||
},
|
||||
{
|
||||
dir: "metrics",
|
||||
basename: "converted_modules_path_map.json",
|
||||
},
|
||||
{
|
||||
dir: "metrics",
|
||||
basename: "converted_modules_path_map.bzl",
|
||||
},
|
||||
{
|
||||
dir: "product_config",
|
||||
basename: "soong_config_variables.bzl",
|
||||
},
|
||||
{
|
||||
dir: "product_config",
|
||||
basename: "arch_configuration.bzl",
|
||||
},
|
||||
{
|
||||
dir: "api_levels",
|
||||
basename: GeneratedBuildFileName,
|
||||
},
|
||||
{
|
||||
dir: "api_levels",
|
||||
basename: "api_levels.json",
|
||||
},
|
||||
{
|
||||
dir: "api_levels",
|
||||
basename: "platform_versions.bzl",
|
||||
},
|
||||
{
|
||||
dir: "allowlists",
|
||||
basename: GeneratedBuildFileName,
|
||||
},
|
||||
{
|
||||
dir: "allowlists",
|
||||
basename: "mixed_build_prod_allowlist.txt",
|
||||
},
|
||||
{
|
||||
dir: "allowlists",
|
||||
basename: "mixed_build_staging_allowlist.txt",
|
||||
},
|
||||
}
|
||||
|
||||
less := func(a bazelFilepath, b bazelFilepath) bool {
|
||||
return a.dir+"/"+a.basename < b.dir+"/"+b.basename
|
||||
}
|
||||
|
||||
fileToFilepath := func(a BazelFile) bazelFilepath {
|
||||
return bazelFilepath{basename: a.Basename, dir: a.Dir}
|
||||
}
|
||||
|
||||
sort.Slice(expectedFilePaths, func(i, j int) bool {
|
||||
return less(expectedFilePaths[i], expectedFilePaths[j])
|
||||
})
|
||||
sort.Slice(files, func(i, j int) bool {
|
||||
return less(fileToFilepath(files[i]), fileToFilepath(files[j]))
|
||||
})
|
||||
|
||||
i := 0
|
||||
j := 0
|
||||
for i < len(expectedFilePaths) && j < len(files) {
|
||||
expectedFile, actualFile := expectedFilePaths[i], files[j]
|
||||
|
||||
if actualFile.Dir == expectedFile.dir && actualFile.Basename == expectedFile.basename {
|
||||
i++
|
||||
j++
|
||||
} else if less(expectedFile, fileToFilepath(actualFile)) {
|
||||
t.Errorf("Did not find expected file %s/%s", expectedFile.dir, expectedFile.basename)
|
||||
i++
|
||||
} else {
|
||||
t.Errorf("Found unexpected file %s/%s", actualFile.Dir, actualFile.Basename)
|
||||
j++
|
||||
}
|
||||
}
|
||||
for i < len(expectedFilePaths) {
|
||||
expectedFile := expectedFilePaths[i]
|
||||
t.Errorf("Did not find expected file %s/%s", expectedFile.dir, expectedFile.basename)
|
||||
i++
|
||||
}
|
||||
for j < len(files) {
|
||||
actualFile := files[j]
|
||||
t.Errorf("Found unexpected file %s/%s", actualFile.Dir, actualFile.Basename)
|
||||
j++
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user