Merge "core/Makefile: Define write-file-lines unconditionally" into main
This commit is contained in:
@@ -3395,6 +3395,14 @@ endif
|
|||||||
|
|
||||||
FULL_SYSTEMIMAGE_DEPS += $(INTERNAL_ROOT_FILES) $(INSTALLED_FILES_FILE_ROOT)
|
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
|
ifdef BUILDING_SYSTEM_IMAGE
|
||||||
|
|
||||||
@@ -3448,14 +3456,6 @@ BUILT_SYSTEMIMAGE :=$= $(systemimage_intermediates)/system.img
|
|||||||
$(systemimage_intermediates)/staging_dir.stamp: $(FULL_SYSTEMIMAGE_DEPS)
|
$(systemimage_intermediates)/staging_dir.stamp: $(FULL_SYSTEMIMAGE_DEPS)
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
define write-file-lines
|
|
||||||
$(1):
|
|
||||||
@echo Writing $$@
|
|
||||||
rm -f $$@
|
|
||||||
echo -n > $$@
|
|
||||||
$$(foreach f,$(2),echo "$$(f)" >> $$@$$(newline))
|
|
||||||
endef
|
|
||||||
|
|
||||||
# $(1): output file
|
# $(1): output file
|
||||||
define build-systemimage-target
|
define build-systemimage-target
|
||||||
@echo "Target system fs image: $(1)"
|
@echo "Target system fs image: $(1)"
|
||||||
|
Reference in New Issue
Block a user