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

am: c432176a09

Change-Id: Id86fa037599fd9eafc338da8544529d147d68cf0
This commit is contained in:
Colin Cross
2017-02-23 02:17:16 +00:00
committed by android-build-merger

View File

@@ -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)