From 37a1986454c67b031cb9b12e6427b31f8b49d0a1 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 31 Oct 2018 16:31:46 -0700 Subject: [PATCH] De-dup INTERNAL_SYSTEMIMAGE_FILES to fix PDK builds On PDK builds, we sometimes end up with multiple entries in INTERNAL_SYSTEMIMAGE_FILES, if we've got the definition for it, and it's in PDK_FUSION_SYSIMG_FILES. This causes us to define multiple rules in sdk_font.mk, leading to overriding commands errors. Bug: 118634643 Test: attempt PDK build Change-Id: Ieb4f46c0eece96cf246197af4b03e693493cc6a1 --- core/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/Makefile b/core/Makefile index 672175750e..55bcbcc238 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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)