commit 91c480467300edb17f650589775548133512a8ca
author Colin Cross <ccross@android.com> Thu Feb 23 02:28:56 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 23 02:28:56 2017 +0000
tree 9b4087c9ac7e8c092e4121a608606c59af91670e
parent a7886dc417249a397cf50a5bfa1a4e88a0914af7
parent 58dfc7dc0fa558b49b66a67afc4de7f409539876

Merge "Don't duplicate default platform libraries into proguard flags" am: f7b6bf8cb1 am: c432176a09
am: 58dfc7dc0f

Change-Id: I5873f9b327f41c78d6694f06e4cedaed0e64ba3d

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 3ffa8d2..ea81639 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -550,7 +550,8 @@
 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)