//tools/binary_size: Add Disassemble() to console.py. Tweak metadata.

tools/binary_size/describe.py

Index: tools/binary_size/describe.py
diff --git a/tools/binary_size/describe.py b/tools/binary_size/describe.py
index 3bae8f7aa8051e90dc043d6094c8f9b41fdd5a75..49ab045200f24039b933b8b2e01dbba1aa089b02 100644
--- a/tools/binary_size/describe.py
+++ b/tools/binary_size/describe.py
@@ -193,17 +193,20 @@ def DescribeSizeInfoCoverage(size_info):
 
 
 def _UtcToLocal(utc):
-    epoch = time.mktime(utc.timetuple())
-    offset = (datetime.datetime.fromtimestamp(epoch) -
-              datetime.datetime.utcfromtimestamp(epoch))
-    return utc + offset
+  epoch = time.mktime(utc.timetuple())
+  offset = (datetime.datetime.fromtimestamp(epoch) -
+            datetime.datetime.utcfromtimestamp(epoch))
+  return utc + offset
 
 
 def DescribeSizeInfoMetadata(size_info):
-  time_str = 'Unknown'
-  if size_info.timestamp:
-    time_str = _UtcToLocal(size_info.timestamp).strftime('%Y-%m-%d %H:%M:%S')
-  return 'mapfile mtime=%s \ttag=%s' % (time_str, size_info.tag)
+  display_dict = size_info.metadata.copy()
+  timestamp = display_dict.get(models.METADATA_ELF_MTIME)
+  if timestamp:
+    timestamp_obj = datetime.datetime.utcfromtimestamp(timestamp)
+    display_dict[models.METADATA_ELF_MTIME] = (
+        _UtcToLocal(timestamp_obj).strftime('%Y-%m-%d %H:%M:%S'))
+  return ' '.join(sorted('%s=%s' % t for t in display_dict.iteritems()))
 
 
 def GenerateLines(obj, verbose=False):