diff --git a/compatibility_matrices/Android.bp b/compatibility_matrices/Android.bp index 712f28a938..b3ca29309d 100644 --- a/compatibility_matrices/Android.bp +++ b/compatibility_matrices/Android.bp @@ -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", } diff --git a/compatibility_matrices/build/vintf_compatibility_matrix.go b/compatibility_matrices/build/vintf_compatibility_matrix.go index 4f342b252e..c72cbde05c 100644 --- a/compatibility_matrices/build/vintf_compatibility_matrix.go +++ b/compatibility_matrices/build/vintf_compatibility_matrix.go @@ -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" -}