[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 496390ccf5 -s ours am: d50ec68ee9 -s ours
am: 6166fb80bd -s ours
Change-Id: I4451a9de529431010c6aa8808ccd7c84e2364bdd
diff --git a/template/iface_fuzzer_test/iface_fuzzer_test.py b/template/iface_fuzzer_test/iface_fuzzer_test.py
index bfdd973..35fd53b 100644
--- a/template/iface_fuzzer_test/iface_fuzzer_test.py
+++ b/template/iface_fuzzer_test/iface_fuzzer_test.py
@@ -37,8 +37,6 @@
"""
_VTS_SPEC_DIR_TARGET = os.path.join(config.FUZZER_TEST_DIR, 'spec')
- start_vts_agents = False
-
def _PushVtsResources(self, hal_name, hal_version):
"""Pushes resources needed for test to target device.
@@ -77,12 +75,11 @@
string list, directories on target
"""
hal_name_dir = vts_spec_utils.HalNameDir(hal_name)
- spec_dirs = [
- os.path.join(self._VTS_SPEC_DIR_TARGET, hal_name_dir, hal_version)
- ]
+ spec_dirs = [os.path.join(self._VTS_SPEC_DIR_TARGET, hal_name_dir,
+ hal_version)]
- imported_hals = self._vts_spec_parser.ImportedHals(
- hal_name, hal_version)
+ imported_hals = self._vts_spec_parser.ImportedHals(hal_name,
+ hal_version)
for name, version in imported_hals:
spec_dirs.append(
os.path.join(self._VTS_SPEC_DIR_TARGET,
@@ -96,8 +93,8 @@
hal_name, hal_version = vts_spec_utils.HalPackageToNameAndVersion(
hal_package)
- imported_hals = self._vts_spec_parser.IndirectImportedHals(
- hal_name, hal_version)
+ imported_hals = self._vts_spec_parser.IndirectImportedHals(hal_name,
+ hal_version)
self._PushVtsResources(hal_name, hal_version)
for name, version in imported_hals:
self._PushVtsResources(name, version)
diff --git a/template/libfuzzer_test/libfuzzer_test.py b/template/libfuzzer_test/libfuzzer_test.py
index a0fc04b..28137c5 100644
--- a/template/libfuzzer_test/libfuzzer_test.py
+++ b/template/libfuzzer_test/libfuzzer_test.py
@@ -39,8 +39,6 @@
_dut: AndroidDevice, the device under test as config.
"""
- start_vts_agents = False
-
def setUpClass(self):
"""Creates a remote shell instance, and copies data files."""
required_params = [