Remove android.test.** and c.a.i.u.* injar filters
These were added to work around Proguard problems caused by duplicate
classes in the APK and libraries. Unfortunately, that work around
caused other Proguard problems when trying to remove classes from
android.jar.
Bug: 30188076
Test: make checkbuild
Change-Id: I59345e60073faf3337215ecaa62cf640e19495c8
diff --git a/core/java.mk b/core/java.mk
index 7560dc6..e96b536 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -724,7 +724,7 @@
proguard_injar_filters :=
ifdef LOCAL_SDK_VERSION
ifeq (,$(filter-out current system_current test_current, $(LOCAL_SDK_VERSION)))
-proguard_injar_filters := (!junit/framework/**,!junit/runner/**,!junit/textui/**,!android/test/**,!com/android/internal/util/*)
+proguard_injar_filters := (!junit/framework/**,!junit/runner/**,!junit/textui/**)
endif
endif