commit 3845288c52bf080b0c5a01005de15e11a0033254
author Xin Li <delphij@google.com> Mon Mar 11 15:05:21 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Mar 11 15:05:21 2019 -0700
tree 02955b06ddc151440fd545e6809d96644dd4f6a9
parent ec3b51f4686aec06b9ebd23c80079dad1d642344
parent 156cb80a17b0e1f51ca7ed81f7c8121cfd5713e5

[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" am: cc463fbc11 -s ours am: 98537a7102 -s ours
am: 156cb80a17 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic948eacbc94602f2399b117f6f3d3324a547edd7

template/iface_fuzzer_test/iface_fuzzer_test.py

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)

template/libfuzzer_test/libfuzzer_test.py

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 = [