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

Cleanup cargo2android.py.

Browse Source 
Followup to aosp/1548356 to remove the now unused host parameter to add_test.

Test: Manually run script and verify the output.
Change-Id: Id00e56a2dc5523a44dc3cb473702c1ae8785d3db
This commit is contained in:
Joel Galenson
2021-01-13 08:36:31 -08:00
parent e261a15598
commit 4319a7e8a5
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/cargo2android.py
View File

@@ -182,12 +182,13 @@ def escape_quotes(s): # replace '"' with '\\"'
class TestMapping(object):
"""Entries for a TEST_MAPPING file."""
# Note that this only includes device tests.
def __init__(self):
self.entries = []
def add_test(self, name, host):
self.entries.append((name, host))
def add_test(self, name):
self.entries.append(name)
def is_empty(self):
return not self.entries
@@ -200,13 +201,11 @@ class TestMapping(object):
outf.write('// Generated by cargo2android.py for tests in Android.bp\n')
outf.write('{\n "presubmit": [\n')
is_first = True
for (name, host) in self.entries:
for name in self.entries:
if not is_first: # add comma and '\n' after the previous entry
outf.write(',\n')
is_first = False
outf.write(' {\n')
if host:
outf.write(' "host": true,\n')
outf.write(' "name": "' + name + '"' + '\n }')
outf.write('\n ]\n}\n')
@@ -652,14 +651,13 @@ class Crate(object):
self.decide_one_module_type(crate_type)
self.dump_one_android_module(crate_type)
# We do not add host tests, as these are handled in the Android.bp file.
# self.runner.add_test(self.outf_name, self.module_name, True)
if saved_device_supported:
self.device_supported = True
self.host_supported = False
self.module_name = self.test_module_name()
self.decide_one_module_type(crate_type)
self.dump_one_android_module(crate_type)
self.runner.add_test(self.outf_name, self.module_name, False)
self.runner.add_test(self.outf_name, self.module_name)
self.host_supported = saved_host_supported
self.device_supported = saved_device_supported
self.main_src = saved_main_src
@@ -1192,11 +1190,11 @@ class Runner(object):
self.test_mappings[bp_file_name].dump(name)
return self
def add_test(self, bp_file_name, test_name, host):
def add_test(self, bp_file_name, test_name):
if bp_file_name not in self.test_mappings:
self.test_mappings[bp_file_name] = TestMapping()
mapping = self.test_mappings[bp_file_name]
mapping.add_test(test_name, host)
mapping.add_test(test_name)
def try_claim_module_name(self, name, owner):
"""Reserve and return True if it has not been reserved yet."""