From e949585a62834db21ec990001400a5af334e9715 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Mon, 15 May 2017 15:01:31 +0100 Subject: [PATCH] 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 --- core/java.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java.mk b/core/java.mk index ed05484cd..0a60b6943 100644 --- a/core/java.mk +++ b/core/java.mk @@ -609,7 +609,7 @@ extra_input_jar := endif # 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 # 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 @@ -618,7 +618,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/**) +proguard_injar_filters := (!junit/framework/**,!junit/runner/**,!android/test/**,!com/android/internal/util/*) endif endif endif