Don't duplicate default platform libraries into proguard flags

Test: builds
Change-Id: Ib972d954972614f3e6ce522c58fce06beeda3cea

diff --git a/core/java.mk b/core/java.mk
index d1ac6c7..70d79af 100644 (file)
--- 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)