Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / build / android / pylib / instrumentation / test_jar.py

diff --git a/src/build/android/pylib/instrumentation/test_jar.py b/src/build/android/pylib/instrumentation/test_jar.py
index 964dca7..c81258f 100644 (file)
--- a/src/build/android/pylib/instrumentation/test_jar.py
+++ b/src/build/android/pylib/instrumentation/test_jar.py
@@ -268,13 +268,14 @@ class TestJar(object):
               '%s has no annotations. Assuming "%s".', test,
               self._DEFAULT_ANNOTATION)
           available_tests.append(test)
-      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.IsHostDrivenTest(m)]
 
+    if exclude_annotation_list:
+      excluded_tests = self.GetAnnotatedTests(exclude_annotation_list)
+      available_tests = list(set(available_tests) - set(excluded_tests))
+
     tests = []
     if test_filter:
       # |available_tests| are in adb instrument format: package.path.class#test.