From 54747a7f092309e62af5b1e0529b09e50591a312 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 15 Jun 2017 08:42:23 +0100 Subject: [PATCH] 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 --- core/java.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java.mk b/core/java.mk index 4cb81143b7..8dc4b22e9c 100644 --- a/core/java.mk +++ b/core/java.mk @@ -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