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

Commit 3cd4a076 authored by Colin Cross's avatar Colin Cross
Browse files

Add out/soong/late-${TARGET_PRODUCT}.mk 

Read out/soong/late-${TARGET_PRODUCT}.mk after reading Android.mk files
to allow Soong's makevars singleton to use $(call dist-for-goals).

Bug: 153485543
Test: m lint-check dist
Change-Id: I7754fd1b8dab508c96ad59beed67f0d6c4ff75f0
Merged-In: I7754fd1b8dab508c96ad59beed67f0d6c4ff75f0
(cherry picked from commit 8ca4092a)
parent 0ffb2a82

core/main.mk

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ FULL_BUILD := true 
# Include all of the makefiles in the system

#



subdir_makefiles := $(SOONG_ANDROID_MK) $(file <$(OUT_DIR)/.module_paths/Android.mk.list)

subdir_makefiles := $(SOONG_ANDROID_MK) $(file <$(OUT_DIR)/.module_paths/Android.mk.list) $(SOONG_OUT_DIR)/late-$(TARGET_PRODUCT).mk

subdir_makefiles_total := $(words int $(subdir_makefiles) post finish)

.KATI_READONLY := subdir_makefiles_total