//tools/binary_size: Add object file count to Print()

tools/binary_size/models.py

 # Copyright 2017 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 """Classes that comprise the data model for binary size analysis.
 
 The primary classes are Symbol, and SymbolGroup.
 
 Description of common properties:
   * address: The start address of the symbol.
         May be 0 (e.g. for .bss or for SymbolGroups).
@@ skipping 218 matching lines @@
     if isinstance(key, slice):
       return self._symbols.__getitem__(key)
     if isinstance(key, basestring) or key > len(self._symbols):
       found = self.WhereAddressInRange(key)
       if len(found) != 1:
         raise KeyError('%d symbols found at address %s.' % (len(found), key))
       return found[0]
     return self._symbols[key]
 
   def __sub__(self, other):
-    if other.IsGroup():
-      other_ids = set(id(s) for s in other)
-    else:
-      other_ids = set((id(other),))
+    other_ids = set(id(s) for s in other)
     new_symbols = [s for s in self if id(s) not in other_ids]
     return self._CreateTransformed(new_symbols, section_name=self.section_name)
 
   def __add__(self, other):
     self_ids = set(id(s) for s in self)
     new_symbols = self._symbols + [s for s in other if id(s) not in self_ids]
     return self._CreateTransformed(new_symbols, section_name=self.section_name,
                                    is_sorted=False)
 
   @property
   def address(self):
     return 0
 
   @property
   def full_name(self):
     return None
 
   @property
   def is_anonymous(self):
     return False
 
   @property
+  def object_path(self):
+    return None
+
+  @property
   def source_path(self):
     return None
 
   @property
   def size(self):
     if self._size is None:
       if self.IsBss():
         self._size = sum(s.size for s in self)
       self._size = sum(s.size for s in self if not s.IsBss())
     return self._size
@@ skipping 356 matching lines @@
 
 def _ExtractPrefixBeforeSeparator(string, separator, count=1):
   idx = -len(separator)
   prev_idx = None
   for _ in xrange(count):
     idx = string.find(separator, idx + len(separator))
     if idx < 0:
       break
     prev_idx = idx
   return string[:prev_idx]