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
This commit is contained in:
Paul Duffin 2017-12-11 14:09:19 +00:00
parent 49cb5d3ea4
commit 8fe958d0b9

View file

@ -724,7 +724,7 @@ endif
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