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

Commit 00ae5874 authored by Yi-Yo Chiang's avatar Yi-Yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "core/Makefile: Define write-file-lines unconditionally" into main am: 99935047

parents 8b7801fd 99935047
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
@@ -3395,6 +3395,14 @@ endif

FULL_SYSTEMIMAGE_DEPS += $(INTERNAL_ROOT_FILES) $(INSTALLED_FILES_FILE_ROOT)

define write-file-lines
$(1):
	@echo Writing $$@
	rm -f $$@
	echo -n > $$@
	$$(foreach f,$(2),echo "$$(f)" >> $$@$$(newline))
endef

# -----------------------------------------------------------------
ifdef BUILDING_SYSTEM_IMAGE

@@ -3448,14 +3456,6 @@ BUILT_SYSTEMIMAGE :=$= $(systemimage_intermediates)/system.img
$(systemimage_intermediates)/staging_dir.stamp: $(FULL_SYSTEMIMAGE_DEPS)
	touch $@

define write-file-lines
$(1):
	@echo Writing $$@
	rm -f $$@
	echo -n > $$@
	$$(foreach f,$(2),echo "$$(f)" >> $$@$$(newline))
endef

# $(1): output file
define build-systemimage-target
  @echo "Target system fs image: $(1)"