Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f897fce authored by Trevor Radcliffe's avatar Trevor Radcliffe
Browse files

Reexport whole_static_libs in cc_library_headers 

Fixes: 236268577
Test: Unit Tests
Change-Id: I3a13f850d1d593b90c79f668f1eaf5be0035db1f
parent 6e294b49

bp2build/cc_library_headers_conversion_test.go

+21 −0
Original line number Diff line number Diff line
@@ -390,3 +390,24 @@ cc_library_headers { 
		},

	})

}



func TestCcLibraryHeadersWholeStaticLibsReexported(t *testing.T) {

	runCcLibraryHeadersTestCase(t, Bp2buildTestCase{

		Description:                "cc_library_headers whole_static_libs is reexported",

		ModuleTypeUnderTest:        "cc_library_headers",

		ModuleTypeUnderTestFactory: cc.LibraryHeaderFactory,

		Filesystem:                 map[string]string{},

		Blueprint: soongCcLibraryHeadersPreamble + `

cc_library_headers {

		name: "foo_headers",

		whole_static_libs: ["foo_export"],

    bazel_module: { bp2build_available: true },

}

` + simpleModuleDoNotConvertBp2build("cc_library_headers", "foo_export"),

		ExpectedBazelTargets: []string{

			makeBazelTarget("cc_library_headers", "foo_headers", AttrNameToString{

				"deps": `[":foo_export"]`,

			}),

		},

	})

}

cc/library_headers.go

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ func libraryHeadersBp2Build(ctx android.TopDownMutatorContext, module *Module) { 
	exportedIncludes := bp2BuildParseExportedIncludes(ctx, module, &baseAttributes.includes)

	linkerAttrs := baseAttributes.linkerAttributes

	(&linkerAttrs.deps).Append(linkerAttrs.dynamicDeps)

	(&linkerAttrs.deps).Append(linkerAttrs.wholeArchiveDeps)



	attrs := &bazelCcLibraryHeadersAttributes{

		Export_includes:          exportedIncludes.Includes,