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

Commit e949585a authored by Paul Duffin's avatar Paul Duffin
Browse files

Add c/a/i/u/* to the list of injar filters 

Previous change that moved com.android.internal.util.Predicate
to the legacy-android-test JAR caused a proguard build breakage
due to duplicate classes in the application and library. This
fixes it in the same way as previous issues with junit and
android.test classes were resolved by excluding those classes
from the application JAR.

Bug: 30188076
Test: make checkbuild and make -j ANDROID_FORCE_JACK_ENABLED=disabled checkbuild
Change-Id: Ica0089607187f970251ddba339a1f71d4cad80cc
parent bba00b2c

core/java.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -609,7 +609,7 @@ extra_input_jar := 
endif

endif





# If not using jack and building against the current SDK version then filter

# If not using jack and building against the current SDK version then filter

# out junit and android.test classes from the application that are to be

# out the junit, android.test and c.a.i.u.Predicate classes that are to be

# removed from the Android API as part of b/30188076 but which are still

# removed from the Android API as part of b/30188076 but which are still

# present in the Android API. This is to allow changes to be made to the

# present in the Android API. This is to allow changes to be made to the

# build to statically include those classes into the application without

# build to statically include those classes into the application without
@@ -618,7 +618,7 @@ proguard_injar_filters := 
ifndef LOCAL_JACK_ENABLED

ifndef LOCAL_JACK_ENABLED

ifdef LOCAL_SDK_VERSION

ifdef LOCAL_SDK_VERSION

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

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

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

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

endif

endif

endif

endif

endif

endif