Merge "Support dynamic config file for cc_test." into main (6c50f3ef) · Commits · e / os / android_build_soong

bp2build/cc_test_conversion_test.go

+3 −1

Original line number	Diff line number	Diff line
		@@ -239,6 +239,7 @@ func TestCcTest_TestConfigAndroidTestXML(t *testing.T) {
		description: "cc test that defaults to test config AndroidTest.xml",
		filesystem: map[string]string{
		"AndroidTest.xml": "",
		"DynamicConfig.xml": "",
		},
		blueprint: `
		cc_test {
		@@ -253,6 +254,7 @@ cc_test {
		"srcs": `["test.cpp"]`,
		"target_compatible_with": `["//build/bazel/platforms/os:android"]`,
		"test_config": `"AndroidTest.xml"`,
		"dynamic_config": `"DynamicConfig.xml"`,
		"deps": `[
		":libgtest_main",
		":libgtest",

+7 −1

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ const (

		type TestConfigAttributes struct {
		Test_config *bazel.Label
		Dynamic_config *bazel.Label

		Auto_generate_test_config *bool
		Template_test_config *bazel.Label
		@@ -58,6 +59,11 @@ func GetTestConfigAttributes(
		templateInstallBase *string) TestConfigAttributes {

		attrs := TestConfigAttributes{}

		dynamicConfig := "DynamicConfig.xml"
		c, _ := android.BazelStringOrLabelFromProp(ctx, &dynamicConfig)
		attrs.Dynamic_config = c.Value

		attrs.Test_config = GetTestConfig(ctx, testConfig)
		// do not generate a test config if
		// 1) test config already found