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

Commit cc00a0cd authored by Cole Faust's avatar Cole Faust
Browse files

Move write-partition-file-list out of if statement 

write-partition-file-list was mistakenly moved into an
`ifdef BUILDING_RAMDISK_IMAGE`, so it caused other partitions to fail
to build on products that don't use a ramdisk.

Bug: 378738827
Test: Will run abtd on the failing product
Change-Id: I270adbed74054b573e5dab40e5900ceca45e1dfc
parent 4e9d7b3c

core/Makefile

+28 −27
Original line number Diff line number Diff line
@@ -192,6 +192,34 @@ product_copy_files_ignored := 
unique_product_copy_files_pairs :=

unique_product_copy_files_destinations :=





# Returns a list of EXTRA_INSTALL_ZIPS trios whose primary file is contained within $(1)

# The trios will contain the primary installed file : the directory to unzip the zip to : the zip

define relevant-extra-install-zips

$(strip $(foreach p,$(EXTRA_INSTALL_ZIPS), \

  $(if $(filter $(call word-colon,1,$(p)),$(1)), \

    $(p))))

endef



# Writes a text file that contains all of the files that will be inside a partition.

# All the file paths will be relative to the partition's staging directory.

# It will also take into account files inside zips listed in EXTRA_INSTALL_ZIPS.

#

# Arguments:

#   $(1): Output file

#   $(2): The partition's staging directory

#   $(3): Files to include in the partition

define write-partition-file-list

$(1): PRIVATE_FILES := $(subst $(2)/,,$(filter $(2)/%,$(3)))

$(1): PRIVATE_EXTRA_INSTALL_ZIPS := $(call relevant-extra-install-zips,$(filter $(2)/%,$(3)))

$(1): $$(HOST_OUT_EXECUTABLES)/extra_install_zips_file_list $(foreach p,$(call relevant-extra-install-zips,$(filter $(2)/%,$(3))),$(call word-colon,3,$(p)))

	@echo Writing $$@

	rm -f $$@

	echo -n > $$@

	$$(foreach f,$$(PRIVATE_FILES),echo "$$(f)" >> $$@$$(newline))

	$$(HOST_OUT_EXECUTABLES)/extra_install_zips_file_list $(2) $$(PRIVATE_EXTRA_INSTALL_ZIPS) >> $$@

endef



# -----------------------------------------------------------------

# Returns the max allowed size for an image suitable for hash verification

# (e.g., boot.img, recovery.img, etc).
@@ -1267,33 +1295,6 @@ boototapackage_16k: $(BUILT_BOOT_OTA_PACKAGE_16K) 


endif



# Returns a list of EXTRA_INSTALL_ZIPS trios whose primary file is contained within $(1)

# The trios will contain the primary installed file : the directory to unzip the zip to : the zip

define relevant-extra-install-zips

$(strip $(foreach p,$(EXTRA_INSTALL_ZIPS), \

  $(if $(filter $(call word-colon,1,$(p)),$(1)), \

    $(p))))

endef



# Writes a text file that contains all of the files that will be inside a partition.

# All the file paths will be relative to the partition's staging directory.

# It will also take into account files inside zips listed in EXTRA_INSTALL_ZIPS.

#

# Arguments:

#   $(1): Output file

#   $(2): The partition's staging directory

#   $(3): Files to include in the partition

define write-partition-file-list

$(1): PRIVATE_FILES := $(subst $(2)/,,$(filter $(2)/%,$(3)))

$(1): PRIVATE_EXTRA_INSTALL_ZIPS := $(call relevant-extra-install-zips,$(filter $(2)/%,$(3)))

$(1): $$(HOST_OUT_EXECUTABLES)/extra_install_zips_file_list $(foreach p,$(call relevant-extra-install-zips,$(filter $(2)/%,$(3))),$(call word-colon,3,$(p)))

	@echo Writing $$@

	rm -f $$@

	echo -n > $$@

	$$(foreach f,$$(PRIVATE_FILES),echo "$$(f)" >> $$@$$(newline))

	$$(HOST_OUT_EXECUTABLES)/extra_install_zips_file_list $(2) $$(PRIVATE_EXTRA_INSTALL_ZIPS) >> $$@

endef





ramdisk_intermediates :=$= $(call intermediates-dir-for,PACKAGING,ramdisk)

$(eval $(call write-partition-file-list,$(ramdisk_intermediates)/file_list.txt,$(TARGET_RAMDISK_OUT),$(INTERNAL_RAMDISK_FILES)))