Snap for 9787270 from 9f2c90650453097852533f60b2b606bd8964a368 to tm-qpr3-release
Change-Id: Idc8f3525d5fc0889e69f59d1977f7ffbf1ead5eb
diff --git a/tools/rro/generate-overlayable.py b/tools/rro/generate-overlayable.py
index 2f76a2d..b814118 100755
--- a/tools/rro/generate-overlayable.py
+++ b/tools/rro/generate-overlayable.py
@@ -49,10 +49,12 @@
optional_args.add_argument('-o', '--outputFile', default='', help='Output file path (absolute or relative to cwd). If empty, output to stdout')
required_args = parser.add_argument_group('required arguments')
required_args.add_argument('-n', '--targetName', help='Overlayable name for the overlay.', required=True)
- required_args.add_argument('-r', '--resourcePath', help='Path to resource directory (absolute or relative to cwd)', required=True)
+ required_args.add_argument('-r', '--resourcePath', help='Path to resource directory (absolute or relative to cwd)', required=True, action='append')
args = parser.parse_args()
- resources = get_all_resources(args.resourcePath, args.excludeFiles)
+ resources = set()
+ for path in args.resourcePath:
+ resources |= get_all_resources(path, args.excludeFiles)
generate_overlayable_file(resources, args.targetName, args.policyType, args.outputFile)
def generate_overlayable_file(resources, target_name, policy_type, output_file):
diff --git a/tools/rro/verify-overlayable.py b/tools/rro/verify-overlayable.py
index 2625310..ef99aa4 100755
--- a/tools/rro/verify-overlayable.py
+++ b/tools/rro/verify-overlayable.py
@@ -30,11 +30,13 @@
optional_args.add_argument('-e', '--excludeFiles', nargs='*', help='File paths (absolute or relative to cwd) that should be excluded when generating overlayable.xml')
optional_args.add_argument('-m', '--errorMessage', nargs='*', help='Custom error message if resources are added or removed.')
required_args = parser.add_argument_group('required arguments')
- required_args.add_argument('-r', '--resourcePath', help='Path to resource directory (absolute or relative to cwd)', required=True)
+ required_args.add_argument('-r', '--resourcePath', help='Path to resource directory (absolute or relative to cwd)', required=True, action='append')
required_args.add_argument('-o', '--overlayableFilePath', help='Filepath to overlayable.xml (absolute or relative to cwd).', required=True)
args = parser.parse_args()
- resources = get_all_resources(args.resourcePath, args.excludeFiles)
+ resources = set()
+ for path in args.resourcePath:
+ resources |= get_all_resources(path, args.excludeFiles)
old_mapping = get_resources_from_single_file(args.overlayableFilePath)
compare_resources(old_mapping, resources, args.overlayableFilePath, args.errorMessage)