From 5118a25bd976748a925d0eafff64541578eb2233 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 22 Feb 2017 14:26:55 -0800 Subject: [PATCH] Don't duplicate default platform libraries into proguard flags Test: builds Change-Id: Ib972d954972614f3e6ce522c58fce06beeda3cea --- core/java.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/java.mk b/core/java.mk index d1ac6c7cce..70d79af41f 100644 --- a/core/java.mk +++ b/core/java.mk @@ -540,7 +540,8 @@ endif endif # jack already has the libraries in its classpath and doesn't support jars -legacy_proguard_flags := $(addprefix -libraryjars ,$(my_support_library_sdk_raise) $(full_shared_java_libs)) +legacy_proguard_flags := $(addprefix -libraryjars ,$(my_support_library_sdk_raise) \ + $(filter-out $(my_support_library_sdk_raise),$(full_shared_java_libs))) legacy_proguard_flags += -printmapping $(proguard_dictionary) jack_proguard_flags := -printmapping $(jack_dictionary)