LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Do not write out the --no-test-mapping option." am: cedb102822 am: 3b014257fa am: 6e4fbaaebc

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/1691526

Change-Id: I8627802cbba1e757c5049379b52e1e6ffd4eecc3
This commit is contained in:
Joel Galenson
2021-04-30 00:21:46 +00:00
committed by Automerger Merge Worker
parent 449ee7d803 6e4fbaaebc
commit c7a545aabc
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/cargo2android.py
View File

@@ -1171,7 +1171,8 @@ class Runner(object):
self.bp_files.add(name)
license_section = self.read_license(name)
with open(name, 'w') as outf:
outf.write(ANDROID_BP_HEADER.format(args=' '.join(sys.argv[1:])))
print_args = filter(lambda x: x != "--no-test-mapping", sys.argv[1:])
outf.write(ANDROID_BP_HEADER.format(args=' '.join(print_args)))
outf.write('\n')
outf.write(license_section)
outf.write('\n')
@@ -1641,9 +1642,11 @@ def dump_config(parser, args):
"""Writes the non-default command-line options to the specified file."""
args_dict = vars(args)
# Filter out the arguments that have their default value.
# Also filter certain "temporary" arguments.
non_default_args = {}
for arg in args_dict:
if args_dict[arg] != parser.get_default(arg) and arg != 'dump_config_and_exit':
if args_dict[arg] != parser.get_default(
arg) and arg != 'dump_config_and_exit' and arg != 'no_test_mapping':
non_default_args[arg.replace('_', '-')] = args_dict[arg]
# Write to the specified file.
with open(args.dump_config_and_exit, 'w') as f: