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

Commit f4cbafa7 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Use .KATI_IMPLICIT_OUTPUTS in build/make/core/Makefile 

There were still two places where we weren't using it. There may be
more, but these are the ones that come up with aosp_cf_x86_phone.

Test: m out/target/product/vsoc_x86/root/default.prop
Test: m out/target/product/vsoc_x86/obj/NOTICE_VENDOR.txt
Change-Id: I17671ca2ed60332aed2bf76aa00e42a92661b58a
parent e1cbfc71

core/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ ifdef property_overrides_split_enabled 
INSTALLED_DEFAULT_PROP_TARGET := $(TARGET_OUT)/etc/prop.default

INSTALLED_DEFAULT_PROP_OLD_TARGET := $(TARGET_ROOT_OUT)/default.prop

ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_DEFAULT_PROP_OLD_TARGET)

$(INSTALLED_DEFAULT_PROP_OLD_TARGET): $(INSTALLED_DEFAULT_PROP_TARGET)

$(INSTALLED_DEFAULT_PROP_TARGET): .KATI_IMPLICIT_OUTPUTS := $(INSTALLED_DEFAULT_PROP_OLD_TARGET)

else

# legacy path

INSTALLED_DEFAULT_PROP_TARGET := $(TARGET_ROOT_OUT)/default.prop
@@ -1358,10 +1358,10 @@ endif # BUILDING_VENDOR_BOOT_IMAGE 
# original notice files instead of making rules to copy them somwehere.

# Then we could traverse that without quite as much bash drama.

define combine-notice-files

$(2) $(3): PRIVATE_MESSAGE := $(4)

$(2) $(3): PRIVATE_DIR := $(5)

$(2) : $(3)

$(3) : $(6) $(BUILD_SYSTEM)/Makefile build/make/tools/generate-notice-files.py

$(2): PRIVATE_MESSAGE := $(4)

$(2): PRIVATE_DIR := $(5)

$(2): .KATI_IMPLICIT_OUTPUTS := $(3)

$(2): $(6) $(BUILD_SYSTEM)/Makefile build/make/tools/generate-notice-files.py

	build/make/tools/generate-notice-files.py --text-output $(2) $(foreach xdir, $(7), -e $(xdir) )\

	    $(if $(filter $(1),xml_excluded_vendor_product_odm),-e vendor -e product -e system_ext -e odm --xml-output, \

	      $(if $(filter $(1),xml_excluded_system_product_odm),-e system -e product -e system_ext -e odm --xml-output, \