Merge commit '8a532e5acb02d80e088a7e9407b61df351fd9b90' into manual_merge_8a532e5acb
Change-Id: I21e1d1363e935252eb6e4adf28865e1c9884287d
diff --git a/tools/utils/buildCts.py b/tools/utils/buildCts.py
index 4d04e1a..b4f1e78 100755
--- a/tools/utils/buildCts.py
+++ b/tools/utils/buildCts.py
@@ -171,6 +171,7 @@
plan.IncludeTests(package, test_list)
self.__WritePlan(plan, 'CTS-flaky')
+<<<<<<< HEAD
small_tests = BuildAospSmallSizeTestList()
medium_tests = BuildAospMediumSizeTestList()
new_test_packages = BuildCtsVettedNewPackagesList()
@@ -260,6 +261,12 @@
plan.Include(r'android\.webgl')
self.__WritePlan(plan, 'CTS-webview')
+ # CTS - sub plan for Security
+ plan = tools.TestPlan(packages)
+ plan.Exclude('.*')
+ plan.Include(r'android\.security$')
+ plan.Include('android\.host\.jdwpsecurity$')
+ self.__WritePlan(plan, 'Security')
def BuildAospMediumSizeTestList():
""" Construct a defaultdic that lists package names of medium tests
