commit 5022a346c7899bf035639ccd3dcfa86425a91648
author Paul Duffin <paulduffin@google.com> Thu Jun 15 09:09:45 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 15 09:09:45 2017 +0000
tree 809d66d935424759353906b4cc2aad11487883ae
parent cc2ca23b1e928857b371407ecb812e887680b1e2
parent 3b3bffc0d09bed8b9d7737cd5319674f17365ddd

Merge "Add junit/textui/** to the proguard filter"
am: 3b3bffc0d0

Change-Id: I9b04203701bc38b7b2630ce78513c8f519d10822

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 4cb8114..8dc4b22 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -642,7 +642,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/**,!com/android/internal/util/*)
+proguard_injar_filters := (!junit/framework/**,!junit/runner/**,!junit/textui/**,!android/test/**,!com/android/internal/util/*)
 endif
 endif
 endif