Updates to Android.mk generation.

platform_tools/android/gyp_gen/vars_dict_lib.py

 #!/usr/bin/python
 
 # Copyright 2014 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import collections
 import types
 
@@ skipping 39 matching lines @@
     Number of items in the set.
     """
     return len(self.__li)
 
   def __getitem__(self, index):
     """
     Return item at index.
     """
     return self.__li[index]
 
+  def reset(self):
+    """
+    Reset to empty.
+    """
+    self.__li = []
+
 VAR_NAMES = ['LOCAL_CFLAGS',
              'LOCAL_CPPFLAGS',
              'LOCAL_SRC_FILES',
              'LOCAL_SHARED_LIBRARIES',
              'LOCAL_STATIC_LIBRARIES',
              'LOCAL_C_INCLUDES',
              'LOCAL_EXPORT_C_INCLUDE_DIRS',
+             'DEFINES',
              'KNOWN_TARGETS']
 
 class VarsDict(collections.namedtuple('VarsDict', VAR_NAMES)):
   """
   Custom class for storing the arguments to Android.mk variables. Can be
   treated as a dictionary with fixed keys.
   """
 
   __slots__ = ()
 
@@ skipping 47 matching lines @@
       for var_dict in other_var_dicts:
         if not item in var_dict[key]:
           in_all_lists = False
           break
       if in_all_lists:
         intersection[key].add(item)
         for var_dict in var_dict_list:
           var_dict[key].remove(item)
   return intersection