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

Commit 15d61f73 authored by Yifan Hong's avatar Yifan Hong Committed by Gerrit Code Review
Browse files

Merge changes from topic "revert-2652627-vintf_compatibility_matrix_core_hals-DWOQPAPLXM" into main 

* changes:
  Revert "compatibility_matrices: add vintf_compatibility_matrix.c..."
  Revert "compatibility_matrices: Only allow core HALs for system FCMs."
parents f7d24410 f4e2519f

compatibility_matrices/Android.bp

+0 −6
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ vintf_compatibility_matrix { 
        "kernel_config_q_4.14",

        "kernel_config_q_4.19",

    ],

    core_hals: "only",

}



vintf_compatibility_matrix {
@@ -45,7 +44,6 @@ vintf_compatibility_matrix { 
        "kernel_config_r_4.19",

        "kernel_config_r_5.4",

    ],

    core_hals: "only",

}



vintf_compatibility_matrix {
@@ -59,7 +57,6 @@ vintf_compatibility_matrix { 
        "kernel_config_s_5.4",

        "kernel_config_s_5.10",

    ],

    core_hals: "only",

}



vintf_compatibility_matrix {
@@ -72,7 +69,6 @@ vintf_compatibility_matrix { 
        "kernel_config_t_5.10",

        "kernel_config_t_5.15",

    ],

    core_hals: "only",

}



vintf_compatibility_matrix {
@@ -85,7 +81,6 @@ vintf_compatibility_matrix { 
        "kernel_config_u_5.15",

        "kernel_config_u_6.1",

    ],

    core_hals: "only",

}



vintf_compatibility_matrix {
@@ -98,5 +93,4 @@ vintf_compatibility_matrix { 
        "kernel_config_v_5.15",

        "kernel_config_v_6.1",

    ],

    core_hals: "only",

}

compatibility_matrices/build/vintf_compatibility_matrix.go

+3 −31
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ var ( 
	pctx = android.NewPackageContext("android/vintf")



	assembleVintfRule = pctx.AndroidStaticRule("assemble_vintf", blueprint.RuleParams{

		Command:     `${assembleVintfCmd} -i ${inputs} -o ${out} ${extraParams}`,

		Command:     `${assembleVintfCmd} -i ${inputs} -o ${out}`,

		CommandDeps: []string{"${assembleVintfCmd}"},

		Description: "assemble_vintf -i ${inputs}",

	}, "inputs", "extraParams")

	}, "inputs")



	xmllintXsd = pctx.AndroidStaticRule("xmllint-xsd", blueprint.RuleParams{

		Command:     `$XmlLintCmd --quiet --schema $xsd $in > /dev/null && touch -a $out`,
@@ -64,13 +64,6 @@ type vintfCompatibilityMatrixProperties struct { 


	// list of kernel_config modules to be combined to final output

	Kernel_configs []string



	// Default is "default" for compatibility matrices on /vendor

	// and /odm, and "disallow" for compatibility matrices on /system,

	// /product, and /system_ext.

	// If value is "only", only android.* HALs are allowed. If value

	// is "disallow", none of android.* HALs are allowed.

	Core_hals *string

}



type vintfCompatibilityMatrixRule struct {
@@ -174,7 +167,6 @@ func (g *vintfCompatibilityMatrixRule) GenerateAndroidBuildActions(ctx android.M 
		Output:      g.genFile,

		Args: map[string]string{

			"inputs": strings.Join(inputPaths.Strings(), ":"),

			"extraParams": strings.Join(g.getExtraParams(), " "),

		},

	})

	g.generateValidateBuildAction(ctx, g.genFile, schema.Path())
@@ -199,23 +191,3 @@ func (g *vintfCompatibilityMatrixRule) AndroidMk() android.AndroidMkData { 
		},

	}

}
 


// Return extra parameters to assemble_vintf.

func (g *vintfCompatibilityMatrixRule) getExtraParams() []string {

	var extraParams []string



	coreHalsStrategy := proptools.StringDefault(

		g.properties.Core_hals,

		g.defaultCoreHalsStrategy(),

	)

	extraParams = append(extraParams, "--core-hals", proptools.ShellEscape(coreHalsStrategy))

	return extraParams

}



func (g *vintfCompatibilityMatrixRule) defaultCoreHalsStrategy() string {

	// TODO(b/290408770): default to "disallow" for FCMs



	// For Device (vendor, odm) compatibility matrix, default is

	// to not check anything.

	return "default"

}