Index: build/android/pylib/instrumentation/instrumentation_test_instance.py |
diff --git a/build/android/pylib/instrumentation/instrumentation_test_instance.py b/build/android/pylib/instrumentation/instrumentation_test_instance.py |
index 2443384e51864c28c3a3c22d2b19f34704ae8aca..f65c78e671b22be4ab805d9cae40464c735d83dc 100644 |
--- a/build/android/pylib/instrumentation/instrumentation_test_instance.py |
+++ b/build/android/pylib/instrumentation/instrumentation_test_instance.py |
@@ -17,10 +17,12 @@ from pylib.base import test_instance |
from pylib.constants import host_paths |
from pylib.instrumentation import test_result |
from pylib.instrumentation import instrumentation_parser |
+from pylib.symbols import stack_symbolizer |
from pylib.utils import dexdump |
from pylib.utils import proguard |
from pylib.utils import shared_preference_utils |
+ |
with host_paths.SysPath(host_paths.BUILD_COMMON_PATH): |
import unittest_util # pylint: disable=import-error |
@@ -443,6 +445,7 @@ class InstrumentationTestInstance(test_instance.TestInstance): |
self._initializeTestCoverageAttributes(args) |
self._store_tombstones = False |
+ self._symbolizer = None |
self._initializeTombstonesAttributes(args) |
self._gs_results_bucket = None |
@@ -624,6 +627,9 @@ class InstrumentationTestInstance(test_instance.TestInstance): |
def _initializeTombstonesAttributes(self, args): |
self._store_tombstones = args.store_tombstones |
+ self._symbolizer = stack_symbolizer.Symbolizer( |
+ self.apk_under_test.path if self.apk_under_test else None, |
+ args.enable_relocation_packing) |
def _initializeLogAttributes(self, args): |
self._gs_results_bucket = args.gs_results_bucket |
@@ -716,6 +722,10 @@ class InstrumentationTestInstance(test_instance.TestInstance): |
def suite(self): |
return self._suite |
+ @property |
+ def symbolizer(self): |
+ return self._symbolizer |
+ |
@property |
def test_apk(self): |
return self._test_apk |
@@ -846,4 +856,4 @@ class InstrumentationTestInstance(test_instance.TestInstance): |
#override |
def TearDown(self): |
- pass |
+ self.symbolizer.CleanUp() |