Android: fixes option to exclude specific annotated Android instrumentation tests.

build/android/pylib/instrumentation/test_jar.py

 # Copyright (c) 2013 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.
 
 """Helper class for instrumenation test jar."""
 
 import collections
 import logging
 import os
 import pickle
@@ skipping 179 matching lines @@
     """
     if annotation_filter_list:
       available_tests = self.GetAnnotatedTests(annotation_filter_list)
       # Include un-annotated tests in SmallTest.
       if annotation_filter_list.count(self._DEFAULT_ANNOTATION) > 0:
         for test in self._GetTestsMissingAnnotation():
           logging.warning(
               '%s has no annotations. Assuming "%s".', test,
               self._DEFAULT_ANNOTATION)
           available_tests.append(test)
-      excluded_tests = self.GetAnnotatedTests(exclude_annotation_list)
-      available_tests = list(set(available_tests) - set(excluded_tests))
+      if exclude_annotation_list:
+        excluded_tests = self.GetAnnotatedTests(exclude_annotation_list)
+        available_tests = list(set(available_tests) - set(excluded_tests))
     else:
       available_tests = [m for m in self.GetTestMethods()
                          if not self.IsPythonDrivenTest(m)]
 
     tests = []
     if test_filter:
       # |available_tests| are in adb instrument format: package.path.class#test.
       filter_without_hash = test_filter.replace('#', '.')
       tests = [t for t in available_tests
                if filter_without_hash in t.replace('#', '.')]
     else:
       tests = available_tests
 
     return tests
 
   @staticmethod
   def IsPythonDrivenTest(test):
     return 'pythonDrivenTests' in test