commit c432176a09b4f1e4e2a633c55dfc03d9b2d03f83
author Colin Cross <ccross@android.com> Thu Feb 23 02:15:18 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 23 02:15:18 2017 +0000
tree 372377fbda0ecfe2899baa815187e2737e755912
parent 0d0f7e1c7bbc70249fdedb35b75554ff87a49582
parent f7b6bf8cb19fef155049d06022a21662bb7c148d

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

Change-Id: Ie0320268dcd5c751570fe333f0e32cfdd7c81524

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index bc7b1c1..d1ef634 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -540,7 +540,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)