StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use named options for verify_overlaps"

Browse Source
This commit is contained in:
Paul Duffin
2022-04-08 13:50:17 +00:00
committed by Gerrit Code Review
parent 6f041b56a2 0c12b78ae8
commit 510a5e054d
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/hiddenapi_modular.go
View File

@@ -994,10 +994,11 @@ func buildRuleValidateOverlappingCsvFiles(ctx android.BuilderContext, name strin
rule := android.NewRuleBuilder(pctx, ctx) rule := android.NewRuleBuilder(pctx, ctx)
command := rule.Command(). command := rule.Command().
BuiltTool("verify_overlaps"). BuiltTool("verify_overlaps").
Input(monolithicFilePath) FlagWithInput("--monolithic-flags ", monolithicFilePath)
for _, subset := range csvSubsets { for _, subset := range csvSubsets {
command. command.
Flag("--module-flags ").
Textf("%s:%s", subset.CsvFile, subset.SignaturePatternsFile). Textf("%s:%s", subset.CsvFile, subset.SignaturePatternsFile).
Implicit(subset.CsvFile).Implicit(subset.SignaturePatternsFile) Implicit(subset.CsvFile).Implicit(subset.SignaturePatternsFile)
} }

16
scripts/hiddenapi/verify_overlaps.py
View File

@@ -141,22 +141,26 @@ def main(argv):
args_parser = argparse.ArgumentParser( args_parser = argparse.ArgumentParser(
description="Verify that sets of hidden API flags are each a subset of " description="Verify that sets of hidden API flags are each a subset of "
"the monolithic flag file.") "the monolithic flag file.")
args_parser.add_argument("monolithicFlags", help="The monolithic flag file")
args_parser.add_argument( args_parser.add_argument(
"modularFlags", "--monolithic-flags", help="The monolithic flag file")
nargs=argparse.REMAINDER, args_parser.add_argument(
help="Flags produced by individual bootclasspath_fragment modules") "--module-flags",
action="append",
help="A colon separated pair of paths. The first is a path to a "
"filtered set of flags, and the second is a path to a set of "
"signature patterns that identify the set of classes belonging to "
"a single bootclasspath_fragment module, ")
args = args_parser.parse_args(argv[1:]) args = args_parser.parse_args(argv[1:])
# Read in all the flags into the trie # Read in all the flags into the trie
monolithic_flags_path = args.monolithicFlags monolithic_flags_path = args.monolithic_flags
monolithic_trie = read_flag_trie_from_file(monolithic_flags_path) monolithic_trie = read_flag_trie_from_file(monolithic_flags_path)
# For each subset specified on the command line, create dicts for the flags # For each subset specified on the command line, create dicts for the flags
# provided by the subset and the corresponding flags from the complete set # provided by the subset and the corresponding flags from the complete set
# of flags and compare them. # of flags and compare them.
failed = False failed = False
for modular_pair in args.modularFlags: for modular_pair in args.module_flags:
parts = modular_pair.split(":") parts = modular_pair.split(":")
modular_flags_path = parts[0] modular_flags_path = parts[0]
modular_patterns_path = parts[1] modular_patterns_path = parts[1]