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

Commit e9d61b02 authored by Tao Bao's avatar Tao Bao
Browse files

Rename INSTALLED_SYSTEMIMAGE to INSTALLED_SYSTEMIMAGE_TARGET. 

This gives a consistent mapping between partition names and the image
targets (i.e. partition => INSTALLED_PARTITIONIMAGE_TARGET). This CL
also creates an alias for the old name so that device-specific Makefiles
that refer to INSTALLED_SYSTEMIMAGE would keep working.

This CL renames image-for-partitions to images-for-partitions, and
returns INSTALLED_SYSTEMIMAGE_TARGET for system. It doesn't change the
actual functionality, but allows substantially simplifying the rule.

Test: `m dist` with aosp_taimen-userdebug
Test: `m dist` with a target that uses super partition
Change-Id: I2954ee5d855c1652a33c640ee615649588d5bc04
parent 8e639205

core/Makefile

+28 −28
Original line number Diff line number Diff line
@@ -1874,9 +1874,13 @@ $(BUILT_SYSTEMIMAGE): $(BUILT_ASSEMBLED_SYSTEM_MANIFEST) 
$(BUILT_SYSTEMIMAGE): $(FULL_SYSTEMIMAGE_DEPS) $(INSTALLED_FILES_FILE) $(BUILD_IMAGE_SRCS)

	$(call build-systemimage-target,$@)



INSTALLED_SYSTEMIMAGE := $(PRODUCT_OUT)/system.img

INSTALLED_SYSTEMIMAGE_TARGET := $(PRODUCT_OUT)/system.img

SYSTEMIMAGE_SOURCE_DIR := $(TARGET_OUT)



# INSTALLED_SYSTEMIMAGE_TARGET used to be named INSTALLED_SYSTEMIMAGE. Create an alias for backward

# compatibility, in case device-specific Makefiles still refer to the old name.

INSTALLED_SYSTEMIMAGE := $(INSTALLED_SYSTEMIMAGE_TARGET)



# The system partition needs room for the recovery image as well.  We

# now store the recovery image as a binary patch using the boot image

# as the source (since they are very similar).  Generate the patch so
@@ -1906,21 +1910,21 @@ endif # BOARD_USES_FULL_RECOVERY_IMAGE 
endif # INSTALLED_RECOVERYIMAGE_TARGET

endif # INSTALLED_BOOTIMAGE_TARGET



$(INSTALLED_SYSTEMIMAGE): $(BUILT_SYSTEMIMAGE) $(RECOVERY_FROM_BOOT_PATCH)

$(INSTALLED_SYSTEMIMAGE_TARGET): $(BUILT_SYSTEMIMAGE) $(RECOVERY_FROM_BOOT_PATCH)

	@echo "Install system fs image: $@"

	$(copy-file-to-target)

	$(hide) $(call assert-max-image-size,$@ $(RECOVERY_FROM_BOOT_PATCH),\

		$(call read-image-prop-dictionary,\

			$(systemimage_intermediates)/generated_system_image_info.txt,system_size))



systemimage: $(INSTALLED_SYSTEMIMAGE)

systemimage: $(INSTALLED_SYSTEMIMAGE_TARGET)



.PHONY: systemimage-nodeps snod

systemimage-nodeps snod: $(filter-out systemimage-nodeps snod,$(MAKECMDGOALS)) \

	            | $(INTERNAL_USERIMAGES_DEPS)

	@echo "make $@: ignoring dependencies"

	$(call build-systemimage-target,$(INSTALLED_SYSTEMIMAGE))

	$(hide) $(call assert-max-image-size,$(INSTALLED_SYSTEMIMAGE),\

	$(call build-systemimage-target,$(INSTALLED_SYSTEMIMAGE_TARGET))

	$(hide) $(call assert-max-image-size,$(INSTALLED_SYSTEMIMAGE_TARGET),\

		$(call read-image-prop-dictionary,\

			$(systemimage_intermediates)/generated_system_image_info.txt,system_size))
@@ -2636,7 +2640,7 @@ ifdef BOARD_AVB_SYSTEM_KEY_PATH 
$(eval $(call check-and-set-avb-chain-args,SYSTEM))

else

INTERNAL_AVB_MAKE_VBMETA_IMAGE_ARGS += \

    --include_descriptors_from_image $(INSTALLED_SYSTEMIMAGE)

    --include_descriptors_from_image $(INSTALLED_SYSTEMIMAGE_TARGET)

endif



ifdef INSTALLED_VENDORIMAGE_TARGET
@@ -2752,7 +2756,7 @@ INSTALLED_VBMETAIMAGE_TARGET := $(BUILT_VBMETAIMAGE_TARGET) 
$(INSTALLED_VBMETAIMAGE_TARGET): \

		$(AVBTOOL) \

		$(INSTALLED_BOOTIMAGE_TARGET) \

		$(INSTALLED_SYSTEMIMAGE) \

		$(INSTALLED_SYSTEMIMAGE_TARGET) \

		$(INSTALLED_VENDORIMAGE_TARGET) \

		$(INSTALLED_PRODUCTIMAGE_TARGET) \

		$(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET) \
@@ -2779,16 +2783,12 @@ endif # BOARD_AVB_ENABLE 
# -----------------------------------------------------------------

# super partition image



# (1): list of items like "system", "vendor", "product", "product_services"

# return: map each item to the corresponding image target.

# system => $(BUILT_SYSTEMIMAGE), vendor => $(INSTALLED_VENDORIMAGE_TARGET), etc.

define image-for-partitions

$(foreach item,$(1),$(or $(strip $(foreach mapping,

            system:$(BUILT_SYSTEMIMAGE)

            product_services:$(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET),

        $(if $(filter $(call word-colon,1,$(mapping)),$(item)),

            $(patsubst $(call word-colon,1,$(mapping)),$(call word-colon,2,$(mapping)),$(item))))),

    $(INSTALLED_$(call to-upper,$(item)IMAGE_TARGET))))

# Returns a list of image targets corresponding to the given list of partitions. For example, it

# returns "$(INSTALLED_PRODUCTIMAGE_TARGET)" for "product", or "$(INSTALLED_SYSTEMIMAGE_TARGET)

# $(INSTALLED_VENDORIMAGE_TARGET)" for "system vendor".

# (1): list of partitions like "system", "vendor" or "system product product_services".

define images-for-partitions

$(strip $(foreach item,$(1),$(INSTALLED_$(call to-upper,$(item))IMAGE_TARGET)))

endef



# (1): list of items like "system", "vendor", "product", "product_services"
@@ -2803,7 +2803,7 @@ ifeq (true,$(PRODUCT_BUILD_SUPER_PARTITION)) 
ifdef BOARD_SUPER_PARTITION_SIZE



INSTALLED_SUPERIMAGE_TARGET := $(PRODUCT_OUT)/super.img

$(INSTALLED_SUPERIMAGE_TARGET): $(call image-for-partitions,$(BOARD_SUPER_PARTITION_PARTITION_LIST))

$(INSTALLED_SUPERIMAGE_TARGET): $(call images-for-partitions,$(BOARD_SUPER_PARTITION_PARTITION_LIST))



# For A/B devices, super partition always contains sub-partitions in the _a slot, because this

# image should only be used for bootstrapping / initializing the device. When flashing the image,
@@ -2825,7 +2825,7 @@ $(INSTALLED_SUPERIMAGE_TARGET): $(HOST_OUT_EXECUTABLES)/lpmake 
		--output $@ \

		$(foreach name,$(BOARD_SUPER_PARTITION_PARTITION_LIST), \

			--partition $(name)$(PRIVATE_PARTITION_SUFFIX):$$($(UUIDGEN) $(name)$(PRIVATE_PARTITION_SUFFIX)):readonly:$(call read-size-of-partitions,$(name)) \

			--image $(name)$(PRIVATE_PARTITION_SUFFIX)=$(call image-for-partitions,$(name)))

			--image $(name)$(PRIVATE_PARTITION_SUFFIX)=$(call images-for-partitions,$(name)))



$(call dist-for-goals,dist_files,$(INSTALLED_SUPERIMAGE_TARGET))
@@ -2847,7 +2847,7 @@ droid_targets: check_android_partition_sizes 
.PHONY: check_android_partition_sizes



# Add image dependencies so that generated_*_image_info.txt are written before checking.

check_android_partition_sizes: $(call image-for-partitions,$(BOARD_SUPER_PARTITION_PARTITION_LIST))

check_android_partition_sizes: $(call images-for-partitions,$(BOARD_SUPER_PARTITION_PARTITION_LIST))



check_android_partition_sizes:

	partition_size_list="$(call read-size-of-partitions,$(BOARD_SUPER_PARTITION_PARTITION_LIST))"; \
@@ -3537,7 +3537,7 @@ updatepackage: $(INTERNAL_UPDATE_PACKAGE_TARGET) 
APPCOMPAT_ZIP := $(PRODUCT_OUT)/appcompat.zip

# For apps_only build we'll establish the dependency later in build/make/core/main.mk.

ifndef TARGET_BUILD_APPS

$(APPCOMPAT_ZIP): $(INSTALLED_SYSTEMIMAGE) \

$(APPCOMPAT_ZIP): $(INSTALLED_SYSTEMIMAGE_TARGET) \

		$(INSTALLED_RAMDISK_TARGET) \

		$(INSTALLED_BOOTIMAGE_TARGET) \

		$(INSTALLED_USERDATAIMAGE_TARGET) \
@@ -3567,7 +3567,7 @@ name := $(name)-symbols-$(FILE_NAME_TAG) 
SYMBOLS_ZIP := $(PRODUCT_OUT)/$(name).zip

# For apps_only build we'll establish the dependency later in build/make/core/main.mk.

ifndef TARGET_BUILD_APPS

$(SYMBOLS_ZIP): $(INSTALLED_SYSTEMIMAGE) \

$(SYMBOLS_ZIP): $(INSTALLED_SYSTEMIMAGE_TARGET) \

		$(INSTALLED_RAMDISK_TARGET) \

		$(INSTALLED_BOOTIMAGE_TARGET) \

		$(INSTALLED_USERDATAIMAGE_TARGET) \
@@ -3594,7 +3594,7 @@ endif 
name := $(name)-coverage-$(FILE_NAME_TAG)

COVERAGE_ZIP := $(PRODUCT_OUT)/$(name).zip

ifndef TARGET_BUILD_APPS

$(COVERAGE_ZIP): $(INSTALLED_SYSTEMIMAGE) \

$(COVERAGE_ZIP): $(INSTALLED_SYSTEMIMAGE_TARGET) \

		$(INSTALLED_RAMDISK_TARGET) \

		$(INSTALLED_BOOTIMAGE_TARGET) \

		$(INSTALLED_USERDATAIMAGE_TARGET) \
@@ -3622,7 +3622,7 @@ endif 
name := $(name)-apps-$(FILE_NAME_TAG)



APPS_ZIP := $(PRODUCT_OUT)/$(name).zip

$(APPS_ZIP): $(INSTALLED_SYSTEMIMAGE)

$(APPS_ZIP): $(INSTALLED_SYSTEMIMAGE_TARGET)

	@echo "Package apps: $@"

	$(hide) rm -rf $@

	$(hide) mkdir -p $(dir $@)
@@ -3686,7 +3686,7 @@ ifeq ($(BUILD_QEMU_IMAGES),true) 
INSTALLED_QEMU_SYSTEMIMAGE := $(PRODUCT_OUT)/system-qemu.img

MK_QEMU_IMAGE_SH := device/generic/goldfish/tools/mk_qemu_image.sh

SGDISK_HOST := $(HOST_OUT_EXECUTABLES)/sgdisk

$(INSTALLED_QEMU_SYSTEMIMAGE): $(INSTALLED_SYSTEMIMAGE) $(MK_QEMU_IMAGE_SH) $(SGDISK_HOST) $(SIMG2IMG)

$(INSTALLED_QEMU_SYSTEMIMAGE): $(INSTALLED_SYSTEMIMAGE_TARGET) $(MK_QEMU_IMAGE_SH) $(SGDISK_HOST) $(SIMG2IMG)

	@echo Create system-qemu.img

	(export SGDISK=$(SGDISK_HOST) SIMG2IMG=$(SIMG2IMG); $(MK_QEMU_IMAGE_SH) ${PRODUCT_OUT}/system.img)
@@ -3736,7 +3736,7 @@ INTERNAL_EMULATOR_PACKAGE_FILES += \ 
        $(HOST_OUT_EXECUTABLES)/emulator$(HOST_EXECUTABLE_SUFFIX) \

        prebuilts/qemu-kernel/$(TARGET_ARCH)/kernel-qemu \

        $(INSTALLED_RAMDISK_TARGET) \

		$(INSTALLED_SYSTEMIMAGE) \

        $(INSTALLED_SYSTEMIMAGE_TARGET) \

        $(INSTALLED_USERDATAIMAGE_TARGET)



name := $(TARGET_PRODUCT)-emulator-$(FILE_NAME_TAG)
@@ -3825,7 +3825,7 @@ deps := \ 
	$(SYMBOLS_ZIP) \

	$(COVERAGE_ZIP) \

	$(APPCOMPAT_ZIP) \

	$(INSTALLED_SYSTEMIMAGE) \

	$(INSTALLED_SYSTEMIMAGE_TARGET) \

	$(INSTALLED_QEMU_SYSTEMIMAGE) \

	$(INSTALLED_QEMU_VENDORIMAGE) \

	$(INSTALLED_USERDATAIMAGE_TARGET) \

core/main.mk

+1 −1
Original line number Diff line number Diff line
@@ -1354,7 +1354,7 @@ else # TARGET_BUILD_APPS 
  endif



  ifeq ($(EMMA_INSTRUMENT),true)

    $(JACOCO_REPORT_CLASSES_ALL) : $(INSTALLED_SYSTEMIMAGE)

    $(JACOCO_REPORT_CLASSES_ALL) : $(INSTALLED_SYSTEMIMAGE_TARGET)

    $(call dist-for-goals, dist_files, $(JACOCO_REPORT_CLASSES_ALL))



    # Put XML formatted API files in the dist dir.