Merge "Add c/a/i/u/* to the list of injar filters" am: 9198da8c21 am: 23eb5019bc am: c4977665f1
am: 29cdd2d433
Change-Id: I3acd7ea6942bd83aa9dfe809b4e78aafa788c179
diff --git a/core/java.mk b/core/java.mk
index 5f8e706..95be4f9 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -613,7 +613,7 @@
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
@@ -622,7 +622,7 @@
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