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

Commit 4d11d10c authored by liulvping's avatar liulvping Committed by lvping liu
Browse files

build: Fix bp2build panic issue 

panic in top down mutator "bp2build_conversion_bp2build"
for module "foo".
reflect: call of reflect.Value.NumField on interface Value

Test: go test ./bp2build
Change-Id: I9ee460ca38a37c6a6c1a0787159fa5f38b852b55
parent cd4e6a60

android/variable.go

+3 −0
Original line number Diff line number Diff line
@@ -848,6 +848,9 @@ func (productConfigProperties *ProductConfigProperties) AddSoongConfigProperties 
		// indirections to extract the struct from the reflect.Value.

		if v, ok := maybeExtractConfigVarProp(variableStruct); ok {

			variableStruct = v

		} else if !v.IsValid() {

			// Skip invalid variables which may not used, else leads to panic

			continue

		}



		for j := 0; j < variableStruct.NumField(); j++ {

bp2build/soong_config_module_type_conversion_test.go

+47 −0
Original line number Diff line number Diff line
@@ -200,6 +200,53 @@ custom_cc_library_static { 
)`}})

}



func TestSoongConfigModuleType_MultipleBoolVar_PartialUseNotPanic(t *testing.T) {

	bp := `

soong_config_bool_variable {

	name: "feature1",

}



soong_config_bool_variable {

	name: "feature2",

}



soong_config_module_type {

	name: "custom_cc_library_static",

	module_type: "cc_library_static",

	config_namespace: "acme",

	variables: ["feature1", "feature2",],

	properties: ["cflags"],

}



custom_cc_library_static {

	name: "foo",

	bazel_module: { bp2build_available: true },

	host_supported: true,

	soong_config_variables: {

		feature1: {

			conditions_default: {

				cflags: ["-DDEFAULT1"],

			},

			cflags: ["-DFEATURE1"],

		},

	},

}`



	runSoongConfigModuleTypeTest(t, Bp2buildTestCase{

		Description:                "soong config variables - used part of multiple bool variable do not panic",

		ModuleTypeUnderTest:        "cc_library_static",

		ModuleTypeUnderTestFactory: cc.LibraryStaticFactory,

		Blueprint:                  bp,

		ExpectedBazelTargets: []string{`cc_library_static(

    name = "foo",

    copts = select({

        "//build/bazel/product_variables:acme__feature1": ["-DFEATURE1"],

        "//conditions:default": ["-DDEFAULT1"],

    }),

    local_includes = ["."],

)`}})

}



func TestSoongConfigModuleType_StringAndBoolVar(t *testing.T) {

	bp := `

soong_config_bool_variable {