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

Commit 5e81ce7c authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES""... 

Merge "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES"" am: 2744cbf1 am: 22eb7316
am: ea121f2a

Change-Id: Ib5ccf90b64ff78cad702d7b91e8db51ec68d054a
parents 33067026 ea121f2a

core/static_java_library.mk

+1 −4
Original line number Diff line number Diff line
@@ -119,13 +119,10 @@ endif 
endif



ifdef LOCAL_USE_AAPT2

import_proguard_flag_files := $(strip $(foreach l,$(LOCAL_STATIC_ANDROID_LIBRARIES),\

    $(call intermediates-dir-for,JAVA_LIBRARIES,$(l),,COMMON)/export_proguard_flags))

$(intermediates.COMMON)/export_proguard_flags: $(import_proguard_flag_files) $(addprefix $(LOCAL_PATH)/,$(LOCAL_EXPORT_PROGUARD_FLAG_FILES))

$(intermediates.COMMON)/export_proguard_flags: $(addprefix $(LOCAL_PATH)/,$(LOCAL_EXPORT_PROGUARD_FLAG_FILES))

	@echo "Export proguard flags: $@"

	rm -f $@

	cat $+ >$@

import_proguard_flag_files :=

endif



# add --non-constant-id to prevent inlining constants.