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

bp2build: Unexport GenerateBazelTargetsForDir.

Browse Source 
Resolving a comment from aosp/1595678

Test: build/bazel/scripts/milestone-2/demo.sh
Change-Id: Ia7aba2b149fc09615fbafee67838632c71320f1b
This commit is contained in:
Jingwen Chen
2021-02-22 10:19:34 -05:00
parent 2391d08872
commit ba369adff1
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bp2build/build_conversion.go
View File

@@ -208,12 +208,6 @@ func GenerateBazelTargets(ctx CodegenContext) (map[string]BazelTargets, CodegenM
return buildFileToTargets, metrics
}
// Helper method for tests to easily access the targets in a dir.
func GenerateBazelTargetsForDir(codegenCtx CodegenContext, dir string) BazelTargets {
bazelTargetsMap, _ := GenerateBazelTargets(codegenCtx)
return bazelTargetsMap[dir]
}
// Helper method to trim quotes around strings.
func trimQuotes(s string) string {
if s == "" {

12
bp2build/build_conversion_test.go
View File

@@ -204,7 +204,7 @@ func TestGenerateSoongModuleTargets(t *testing.T) {
android.FailIfErrored(t, errs)
codegenCtx := NewCodegenContext(config, *ctx.Context, QueryView)
bazelTargets := GenerateBazelTargetsForDir(codegenCtx, dir)
bazelTargets := generateBazelTargetsForDir(codegenCtx, dir)
if actualCount, expectedCount := len(bazelTargets), 1; actualCount != expectedCount {
t.Fatalf("Expected %d bazel target, got %d", expectedCount, actualCount)
}
@@ -262,7 +262,7 @@ func TestGenerateBazelTargetModules(t *testing.T) {
}
codegenCtx := NewCodegenContext(config, *ctx.Context, Bp2Build)
bazelTargets := GenerateBazelTargetsForDir(codegenCtx, dir)
bazelTargets := generateBazelTargetsForDir(codegenCtx, dir)
if actualCount, expectedCount := len(bazelTargets), 1; actualCount != expectedCount {
t.Errorf("Expected %d bazel target, got %d", expectedCount, actualCount)
@@ -421,7 +421,7 @@ load("//build/bazel/rules:rules.bzl", "my_library")`,
android.FailIfErrored(t, errs)
codegenCtx := NewCodegenContext(config, *ctx.Context, Bp2Build)
bazelTargets := GenerateBazelTargetsForDir(codegenCtx, dir)
bazelTargets := generateBazelTargetsForDir(codegenCtx, dir)
if actualCount := len(bazelTargets); actualCount != testCase.expectedBazelTargetCount {
t.Fatalf("Expected %d bazel target, got %d", testCase.expectedBazelTargetCount, actualCount)
}
@@ -912,7 +912,7 @@ genrule {
}
codegenCtx := NewCodegenContext(config, *ctx.Context, Bp2Build)
bazelTargets := GenerateBazelTargetsForDir(codegenCtx, checkDir)
bazelTargets := generateBazelTargetsForDir(codegenCtx, checkDir)
if actualCount, expectedCount := len(bazelTargets), len(testCase.expectedBazelTargets); actualCount != expectedCount {
t.Errorf("%s: Expected %d bazel target, got %d", testCase.description, expectedCount, actualCount)
} else {
@@ -1127,7 +1127,7 @@ genrule {
android.FailIfErrored(t, errs)
codegenCtx := NewCodegenContext(config, *ctx.Context, Bp2Build)
bazelTargets := GenerateBazelTargetsForDir(codegenCtx, dir)
bazelTargets := generateBazelTargetsForDir(codegenCtx, dir)
if actualCount := len(bazelTargets); actualCount != 1 {
t.Fatalf("%s: Expected 1 bazel target, got %d", testCase.description, actualCount)
}
@@ -1215,7 +1215,7 @@ func TestAllowlistingBp2buildTargets(t *testing.T) {
android.FailIfErrored(t, errs)
codegenCtx := NewCodegenContext(config, *ctx.Context, Bp2Build)
bazelTargets := GenerateBazelTargetsForDir(codegenCtx, dir)
bazelTargets := generateBazelTargetsForDir(codegenCtx, dir)
if actualCount := len(bazelTargets); actualCount != testCase.expectedCount {
t.Fatalf("%s: Expected %d bazel target, got %d", testCase.description, testCase.expectedCount, actualCount)
}

2
bp2build/cc_library_headers_conversion_test.go
View File

@@ -203,7 +203,7 @@ cc_library_headers {
checkDir = testCase.dir
}
codegenCtx := NewCodegenContext(config, *ctx.Context, Bp2Build)
bazelTargets := GenerateBazelTargetsForDir(codegenCtx, checkDir)
bazelTargets := generateBazelTargetsForDir(codegenCtx, checkDir)
if actualCount, expectedCount := len(bazelTargets), len(testCase.expectedBazelTargets); actualCount != expectedCount {
t.Errorf("%s: Expected %d bazel target, got %d", testCase.description, expectedCount, actualCount)
} else {

2
bp2build/cc_object_conversion_test.go
View File

@@ -167,7 +167,7 @@ cc_defaults {
}
codegenCtx := NewCodegenContext(config, *ctx.Context, Bp2Build)
bazelTargets := GenerateBazelTargetsForDir(codegenCtx, dir)
bazelTargets := generateBazelTargetsForDir(codegenCtx, dir)
if actualCount, expectedCount := len(bazelTargets), len(testCase.expectedBazelTargets); actualCount != expectedCount {
fmt.Println(bazelTargets)
t.Errorf("%s: Expected %d bazel target, got %d", testCase.description, expectedCount, actualCount)

2
bp2build/sh_conversion_test.go
View File

@@ -116,7 +116,7 @@ func TestShBinaryBp2Build(t *testing.T) {
checkDir = testCase.dir
}
codegenCtx := NewCodegenContext(config, *ctx.Context, Bp2Build)
bazelTargets := GenerateBazelTargetsForDir(codegenCtx, checkDir)
bazelTargets := generateBazelTargetsForDir(codegenCtx, checkDir)
if actualCount, expectedCount := len(bazelTargets), len(testCase.expectedBazelTargets); actualCount != expectedCount {
t.Errorf("%s: Expected %d bazel target, got %d", testCase.description, expectedCount, actualCount)
} else {

6
bp2build/testing.go
View File

@@ -175,3 +175,9 @@ func customBp2BuildMutatorFromStarlark(ctx android.TopDownMutatorContext) {
ctx.CreateBazelTargetModule(customBazelModuleFactory, myProtoLibraryProps, attrs)
}
}
// Helper method for tests to easily access the targets in a dir.
func generateBazelTargetsForDir(codegenCtx CodegenContext, dir string) BazelTargets {
buildFileToTargets, _ := GenerateBazelTargets(codegenCtx)
return buildFileToTargets[dir]
}