commit 0764d72f141e19c3a1f287730dc326ec4cd5dff4
author Treehugger Robot <treehugger-gerrit@google.com> Thu Nov 01 06:57:11 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 01 06:57:11 2018 +0000
tree b3a2ca4a0bec16159764e8857cb16a869aafbe76
parent 1b4b378bf7d50b9b386fde9a30aeb2b30a808c5c
parent 37a1986454c67b031cb9b12e6427b31f8b49d0a1

Merge "De-dup INTERNAL_SYSTEMIMAGE_FILES to fix PDK builds"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 6721757..55bcbcc 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1784,12 +1784,12 @@
     $(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)