StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2972991

Change-Id: I0471eabd46f39f0bb5b38dc5ca9ccebe9ce6e334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yi-Yo Chiang
2024-02-23 02:37:05 +00:00
committed by Automerger Merge Worker
parent 8b7801fda5 999350475b
commit 00ae5874ea
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/Makefile
View File

@@ -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)"