Updates to Android.mk generation.

platform_tools/android/tests/ordered_set_tests.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.
 
 """
 Test OrderedSet.
 """
@@ skipping 41 matching lines @@
       counter += 1
     self.assertEqual(counter, len(self.__set))
 
     # Now test removal.
     for i in range(RANGE):
       dummy_var = create_dummy_var(i)
       self.__set.remove(dummy_var)
       self.assertEqual(len(self.__set), RANGE-i-1)
       self.assertFalse(dummy_var in self.__set)
 
+    # Test reset(), for a range of ranges.
+    for subrange in range(RANGE):
+      for i in range(subrange):
+        self.__set.add(create_dummy_var(i))
+      self.assertEqual(len(self.__set), subrange)
+      self.__set.reset()
+      self.assertEqual(len(self.__set), 0)
+
+
 def main():
   loader = unittest.TestLoader()
   suite = loader.loadTestsFromTestCase(OrderedSetTest)
   unittest.TextTestRunner(verbosity=2).run(suite)
 
 if __name__ == "__main__":
   main()