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

bp2build: rename method for readability.

Browse Source 
Rename GenerateSoongModuleTargets to GenerateBazelTargets to reflect its return type.

Test: TH
Change-Id: I5359c8f4365750790837a9d412946d0b7fae64b7
This commit is contained in:
Jingwen Chen
2021-02-02 07:06:56 -05:00
parent 38ce066d3b
commit 4d2c0878a3
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bp2build/bp2build.go
View File

@@ -28,7 +28,7 @@ func Codegen(ctx CodegenContext) {
ruleShims := CreateRuleShims(android.ModuleTypeFactories()) ruleShims := CreateRuleShims(android.ModuleTypeFactories())
buildToTargets := GenerateSoongModuleTargets(ctx.Context(), ctx.mode) buildToTargets := GenerateBazelTargets(ctx.Context(), ctx.mode)
filesToWrite := CreateBazelFiles(ruleShims, buildToTargets, ctx.mode) filesToWrite := CreateBazelFiles(ruleShims, buildToTargets, ctx.mode)
for _, f := range filesToWrite { for _, f := range filesToWrite {

2
bp2build/build_conversion.go
View File

@@ -159,7 +159,7 @@ func propsToAttributes(props map[string]string) string {
return attributes return attributes
} }
func GenerateSoongModuleTargets(ctx bpToBuildContext, codegenMode CodegenMode) map[string]BazelTargets { func GenerateBazelTargets(ctx bpToBuildContext, codegenMode CodegenMode) map[string]BazelTargets {
buildFileToTargets := make(map[string]BazelTargets) buildFileToTargets := make(map[string]BazelTargets)
ctx.VisitAllModules(func(m blueprint.Module) { ctx.VisitAllModules(func(m blueprint.Module) {
dir := ctx.ModuleDir(m) dir := ctx.ModuleDir(m)

10
bp2build/build_conversion_test.go
View File

@@ -201,7 +201,7 @@ func TestGenerateSoongModuleTargets(t *testing.T) {
_, errs = ctx.PrepareBuildActions(config) _, errs = ctx.PrepareBuildActions(config)
android.FailIfErrored(t, errs) android.FailIfErrored(t, errs)
bazelTargets := GenerateSoongModuleTargets(ctx.Context.Context, QueryView)[dir] bazelTargets := GenerateBazelTargets(ctx.Context.Context, QueryView)[dir]
if actualCount, expectedCount := len(bazelTargets), 1; actualCount != expectedCount { if actualCount, expectedCount := len(bazelTargets), 1; actualCount != expectedCount {
t.Fatalf("Expected %d bazel target, got %d", expectedCount, actualCount) t.Fatalf("Expected %d bazel target, got %d", expectedCount, actualCount)
} }
@@ -252,7 +252,7 @@ func TestGenerateBazelTargetModules(t *testing.T) {
_, errs = ctx.ResolveDependencies(config) _, errs = ctx.ResolveDependencies(config)
android.FailIfErrored(t, errs) android.FailIfErrored(t, errs)
bazelTargets := GenerateSoongModuleTargets(ctx.Context.Context, Bp2Build)[dir] bazelTargets := GenerateBazelTargets(ctx.Context.Context, Bp2Build)[dir]
if actualCount, expectedCount := len(bazelTargets), 1; actualCount != expectedCount { if actualCount, expectedCount := len(bazelTargets), 1; actualCount != expectedCount {
t.Fatalf("Expected %d bazel target, got %d", expectedCount, actualCount) t.Fatalf("Expected %d bazel target, got %d", expectedCount, actualCount)
} }
@@ -408,7 +408,7 @@ load("//build/bazel/rules:rules.bzl", "my_library")`,
_, errs = ctx.ResolveDependencies(config) _, errs = ctx.ResolveDependencies(config)
android.FailIfErrored(t, errs) android.FailIfErrored(t, errs)
bazelTargets := GenerateSoongModuleTargets(ctx.Context.Context, Bp2Build)[dir] bazelTargets := GenerateBazelTargets(ctx.Context.Context, Bp2Build)[dir]
if actualCount := len(bazelTargets); actualCount != testCase.expectedBazelTargetCount { if actualCount := len(bazelTargets); actualCount != testCase.expectedBazelTargetCount {
t.Fatalf("Expected %d bazel target, got %d", testCase.expectedBazelTargetCount, actualCount) t.Fatalf("Expected %d bazel target, got %d", testCase.expectedBazelTargetCount, actualCount)
} }
@@ -617,7 +617,7 @@ func TestModuleTypeBp2Build(t *testing.T) {
_, errs = ctx.ResolveDependencies(config) _, errs = ctx.ResolveDependencies(config)
android.FailIfErrored(t, errs) android.FailIfErrored(t, errs)
bazelTargets := GenerateSoongModuleTargets(ctx.Context.Context, Bp2Build)[dir] bazelTargets := GenerateBazelTargets(ctx.Context.Context, Bp2Build)[dir]
if actualCount, expectedCount := len(bazelTargets), 1; actualCount != expectedCount { if actualCount, expectedCount := len(bazelTargets), 1; actualCount != expectedCount {
t.Fatalf("%s: Expected %d bazel target, got %d", testCase.description, expectedCount, actualCount) t.Fatalf("%s: Expected %d bazel target, got %d", testCase.description, expectedCount, actualCount)
} }
@@ -815,7 +815,7 @@ genrule {
_, errs = ctx.ResolveDependencies(config) _, errs = ctx.ResolveDependencies(config)
android.FailIfErrored(t, errs) android.FailIfErrored(t, errs)
bazelTargets := GenerateSoongModuleTargets(ctx.Context.Context, Bp2Build)[dir] bazelTargets := GenerateBazelTargets(ctx.Context.Context, Bp2Build)[dir]
if actualCount := len(bazelTargets); actualCount != 1 { if actualCount := len(bazelTargets); actualCount != 1 {
t.Fatalf("%s: Expected 1 bazel target, got %d", testCase.description, actualCount) t.Fatalf("%s: Expected 1 bazel target, got %d", testCase.description, actualCount)
} }

2
cmd/soong_build/queryview.go
View File

@@ -24,7 +24,7 @@ import (
func createBazelQueryView(ctx *android.Context, bazelQueryViewDir string) error { func createBazelQueryView(ctx *android.Context, bazelQueryViewDir string) error {
ruleShims := bp2build.CreateRuleShims(android.ModuleTypeFactories()) ruleShims := bp2build.CreateRuleShims(android.ModuleTypeFactories())
buildToTargets := bp2build.GenerateSoongModuleTargets(*ctx, bp2build.QueryView) buildToTargets := bp2build.GenerateBazelTargets(*ctx, bp2build.QueryView)
filesToWrite := bp2build.CreateBazelFiles(ruleShims, buildToTargets, bp2build.QueryView) filesToWrite := bp2build.CreateBazelFiles(ruleShims, buildToTargets, bp2build.QueryView)
for _, f := range filesToWrite { for _, f := range filesToWrite {