Merge "bp2build: Unexport GenerateBazelTargetsForDir." (0d249708) · Commits · e / os / android_build_soong

bp2build/build_conversion.go

+0 −6

Original line number	Diff line number	Diff line
		@@ -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 == "" {

bp2build/build_conversion_test.go

+6 −6

Original line number	Diff line number	Diff line
		@@ -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)
		}

bp2build/cc_library_headers_conversion_test.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 {

bp2build/cc_object_conversion_test.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)

bp2build/sh_conversion_test.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 {