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

Commit 861ffd15 authored by Bill Peckham's avatar Bill Peckham Committed by android-build-merger
Browse files

Merge "Avoid adding VINTF manifest fragment more than once." 

am: fd25038f

Change-Id: I44c12257269e039c78f20330fa5713775fec3b65
parents 0a712a08 fd25038f

core/base_rules.mk

+2 −2
Original line number Diff line number Diff line
@@ -524,11 +524,11 @@ my_vintf_installed := $(foreach xml,$(my_vintf_pairs),$(call word-colon,2,$(xml) 


# Only set up copy rules once, even if another arch variant shares it

my_vintf_new_pairs := $(filter-out $(ALL_VINTF_MANIFEST_FRAGMENTS_LIST),$(my_vintf_pairs))

my_vintf_new_installed := $(call copy-many-vintf-manifest-files-checked,$(my_vintf_pairs))

my_vintf_new_installed := $(call copy-many-vintf-manifest-files-checked,$(my_vintf_new_pairs))



ALL_VINTF_MANIFEST_FRAGMENTS_LIST += $(my_vintf_new_pairs)



$(my_all_targets) : $(my_vintf_installed)

$(my_all_targets) : $(my_vintf_new_installed)

endif # LOCAL_VINTF_FRAGMENTS

endif # !LOCAL_IS_HOST_MODULE

endif # !LOCAL_UNINSTALLABLE_MODULE