Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54747a7f authored by Paul Duffin's avatar Paul Duffin
Browse files

Add junit/textui/** to the proguard filter 

Fixes build breakage caused by having duplicate versions of
a class in the application and in the API. This workaround will
be removed once junit classes have been removed from the API.

Bug: 30188076
Test: make Browser2 ANDROID_FORCE_JACK_ENABLED=disabled
Change-Id: I9a9031d3ef6d82f35413b229d588a605f9ed39dc
parent aa09aa81

core/java.mk

+1 −1
Original line number Diff line number Diff line
@@ -642,7 +642,7 @@ proguard_injar_filters := 
ifndef LOCAL_JACK_ENABLED

ifdef LOCAL_SDK_VERSION

ifeq (,$(filter-out current system_current test_current, $(LOCAL_SDK_VERSION)))

proguard_injar_filters := (!junit/framework/**,!junit/runner/**,!android/test/**,!com/android/internal/util/*)

proguard_injar_filters := (!junit/framework/**,!junit/runner/**,!junit/textui/**,!android/test/**,!com/android/internal/util/*)

endif

endif

endif