Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91c48046 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

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

Merge "Don't duplicate default platform libraries into proguard flags" am: f7b6bf8c am: c432176a
am: 58dfc7dc

Change-Id: I5873f9b327f41c78d6694f06e4cedaed0e64ba3d
parents a7886dc4 58dfc7dc
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -550,7 +550,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)