Add tombstones as part of json-results-file for android instr tests.

build/android/pylib/results/json_results.py

Index: build/android/pylib/results/json_results.py
diff --git a/build/android/pylib/results/json_results.py b/build/android/pylib/results/json_results.py
index 80b3c32074f09a6e39c1254a4f74d3538b44296f..1c7b1523968375435963b9779eb09e02507b79ac 100644
--- a/build/android/pylib/results/json_results.py
+++ b/build/android/pylib/results/json_results.py
@@ -8,7 +8,6 @@ import json
 
 from pylib.base import base_test_result
 
-
 def GenerateResultsDict(test_run_results):
   """Create a results dict from |test_run_results| suitable for writing to JSON.
   Args:
@@ -96,13 +95,18 @@ def GenerateResultsDict(test_run_results):
       results_iterable = test_run_result.GetAll()
 
     for r in results_iterable:
-      iteration_data[r.GetName()].append({
+      result_dict = {
           'status': status_as_string(r.GetType()),
           'elapsed_time_ms': r.GetDuration(),
           'output_snippet': r.GetLog(),
           'losless_snippet': '',
           'output_snippet_base64:': '',
-      })
+          }

[jbudorick, 2016/08/18 19:36:18]

left four spaces

[BigBossZhiling, 2016/08/18 22:12:06]

Done.

+      if r.GetTombstones():

[jbudorick, 2016/08/18 19:36:18]

You can consolidate this by just adding

  'tombstones': r.GetTombstones() or ''

to the dict declaration.

[BigBossZhiling, 2016/08/18 22:12:06]

Done.

+        result_dict['tombstones'] = r.GetTombstones()
+      else:
+        result_dict['tombstones'] = ''
+      iteration_data[r.GetName()].append(result_dict)
 
     all_tests = all_tests.union(set(iteration_data.iterkeys()))
     per_iteration_data.append(iteration_data)