Merge "De-dup INTERNAL_SYSTEMIMAGE_FILES to fix PDK builds"
This commit is contained in:
commit
0764d72f14
1 changed files with 2 additions and 2 deletions
|
@ -1784,12 +1784,12 @@ PDK_FUSION_SYSIMG_FILES := \
|
||||||
$(filter-out $(foreach p,$(overridden_packages),$(p) %/$(p).apk), \
|
$(filter-out $(foreach p,$(overridden_packages),$(p) %/$(p).apk), \
|
||||||
$(ALL_PDK_FUSION_FILES))
|
$(ALL_PDK_FUSION_FILES))
|
||||||
|
|
||||||
INTERNAL_SYSTEMIMAGE_FILES := $(filter $(TARGET_OUT)/%, \
|
INTERNAL_SYSTEMIMAGE_FILES := $(sort $(filter $(TARGET_OUT)/%, \
|
||||||
$(ALL_GENERATED_SOURCES) \
|
$(ALL_GENERATED_SOURCES) \
|
||||||
$(ALL_DEFAULT_INSTALLED_MODULES) \
|
$(ALL_DEFAULT_INSTALLED_MODULES) \
|
||||||
$(PDK_FUSION_SYSIMG_FILES) \
|
$(PDK_FUSION_SYSIMG_FILES) \
|
||||||
$(RECOVERY_RESOURCE_ZIP)) \
|
$(RECOVERY_RESOURCE_ZIP)) \
|
||||||
$(PDK_FUSION_SYMLINK_STAMP)
|
$(PDK_FUSION_SYMLINK_STAMP))
|
||||||
|
|
||||||
FULL_SYSTEMIMAGE_DEPS := $(INTERNAL_SYSTEMIMAGE_FILES) $(INTERNAL_USERIMAGES_DEPS)
|
FULL_SYSTEMIMAGE_DEPS := $(INTERNAL_SYSTEMIMAGE_FILES) $(INTERNAL_USERIMAGES_DEPS)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue