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

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

Merge "De-dup INTERNAL_SYSTEMIMAGE_FILES to fix PDK builds" 

am: 0764d72f

Change-Id: Ie6a78316d9209a30b1ad1932194cb49913333b70
parents 77dcf098 0764d72f

core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -1784,12 +1784,12 @@ PDK_FUSION_SYSIMG_FILES := \ 
    $(filter-out $(foreach p,$(overridden_packages),$(p) %/$(p).apk), \

        $(ALL_PDK_FUSION_FILES))



INTERNAL_SYSTEMIMAGE_FILES := $(filter $(TARGET_OUT)/%, \

INTERNAL_SYSTEMIMAGE_FILES := $(sort $(filter $(TARGET_OUT)/%, \

    $(ALL_GENERATED_SOURCES) \

    $(ALL_DEFAULT_INSTALLED_MODULES) \

    $(PDK_FUSION_SYSIMG_FILES) \

    $(RECOVERY_RESOURCE_ZIP)) \

    $(PDK_FUSION_SYMLINK_STAMP)

    $(PDK_FUSION_SYMLINK_STAMP))



FULL_SYSTEMIMAGE_DEPS := $(INTERNAL_SYSTEMIMAGE_FILES) $(INTERNAL_USERIMAGES_DEPS)