tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes from topic "revert-2652627-vintf_compatibility_matrix_core_hals-DWOQPAPLXM" into main am: 15d61f73d2

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2835493

Change-Id: I234a6a069362c095f3aa41750505376f68f37348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yifan Hong 2023-11-29 00:43:20 +00:00 committed by Automerger Merge Worker
commit 29d5bc4a76
1 changed files with 3 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
compatibility_matrices/build/vintf_compatibility_matrix.go
View file

@ -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 {
@ -173,8 +166,7 @@ func (g *vintfCompatibilityMatrixRule) GenerateAndroidBuildActions(ctx android.M
Implicits: inputPaths,
Output: g.genFile,
Args: map[string]string{
"inputs": strings.Join(inputPaths.Strings(), ":"),
"extraParams": strings.Join(g.getExtraParams(), " "),
"inputs": strings.Join(inputPaths.Strings(), ":"),
},
})
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"
}