From 5bf05874614b17d29eb70131e617ca6eea34789b Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Fri, 9 Dec 2016 15:21:45 +0000
Subject: [PATCH] Use legacy-test instead of core-junit

The core-junit library has been replaced with the legacy-test
library. The latter included everything that was in core-junit
plus some android.test classes that were in frameworks.

Bug: 30188076
Test: make checkbuild
Change-Id: Id2ba827705dbd2c27a1183e1153b03c11a8a4074
---
 core/tasks/check_boot_jars/package_whitelist.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/tasks/check_boot_jars/package_whitelist.txt b/core/tasks/check_boot_jars/package_whitelist.txt
index 601017b055..ae690996ac 100644
--- a/core/tasks/check_boot_jars/package_whitelist.txt
+++ b/core/tasks/check_boot_jars/package_whitelist.txt
@@ -116,9 +116,11 @@ com\.android\..*
 
 
 ###################################################
-# core-junit.jar
+# legacy-test.jar
 junit\.extensions
 junit\.framework
+android\.test
+android\.test\.suitebuilder\.annotation
 
 
 ###################################################