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

Do not write out the --no-test-mapping option.

Browse Source 
This option is only intended to be temporary, so if it is used it
should not "propagate" itself by being added to the Android.bp header
or the config file.

Test: Do not see it in the header or config file.
Change-Id: Ibb18c76bdab26aa47b38ac75ea3c410ddc612856
This commit is contained in:
Joel Galenson
2021-04-29 14:31:43 -07:00
parent ec44e57e10
commit 367360cdaf
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) self.bp_files.add(name)
license_section = self.read_license(name) license_section = self.read_license(name)
with open(name, 'w') as outf: 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('\n')
outf.write(license_section) outf.write(license_section)
outf.write('\n') outf.write('\n')
@@ -1641,9 +1642,11 @@ def dump_config(parser, args):
"""Writes the non-default command-line options to the specified file.""" """Writes the non-default command-line options to the specified file."""
args_dict = vars(args) args_dict = vars(args)
# Filter out the arguments that have their default value. # Filter out the arguments that have their default value.
# Also filter certain "temporary" arguments.
non_default_args = {} non_default_args = {}
for arg in args_dict: 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] non_default_args[arg.replace('_', '-')] = args_dict[arg]
# Write to the specified file. # Write to the specified file.
with open(args.dump_config_and_exit, 'w') as f: with open(args.dump_config_and_exit, 'w') as f: