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

Commit ef25de41 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "core & tools: system_dlkm: add dynamic partition"

parents 91e4f9db 13a41379

core/Makefile

+157 −67
Original line number Diff line number Diff line
@@ -1180,48 +1180,6 @@ endif # BOARD_PREBUILT_INIT_BOOT_IMAGE 


endif # BUILDING_INIT_BOOT_IMAGE is not true



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

#  system dlkm image

ifeq ($(BUILDING_SYSTEM_DLKM_IMAGE),true)



INSTALLED_SYSTEM_DLKM_IMAGE_TARGET := $(PRODUCT_OUT)/system_dlkm.img



ifeq ($(BOARD_AVB_ENABLE),true)

$(INSTALLED_SYSTEM_DLKM_IMAGE_TARGET): $(TARGET_SYSTEM_DLKM_SRC) $(MKEROFS) $(AVBTOOL)

	$(call pretty,"Target system_dlkm image: $@")

	rsync -rupE $(TARGET_SYSTEM_DLKM_SRC)/ $(TARGET_SYSTEM_DLKM_OUT)

	$(MKEROFS) "-zlz4hc" $@ $(TARGET_SYSTEM_DLKM_OUT)

	$(call assert-max-image-size,$@,$(BOARD_SYSTEM_DLKM_PARTITION_SIZE))

	$(AVBTOOL) add_hash_footer \

	    --partition_name system_dlkm \

	    --partition_size $(BOARD_SYSTEM_DLKM_PARTITION_SIZE) \

	    --image $@

else

$(INSTALLED_SYSTEM_DLKM_IMAGE_TARGET): $(TARGET_SYSTEM_DLKM_SRC) $(MKEROFS)

	$(call pretty,"Target system_dlkm image: $@")

	rsync -rupE $(TARGET_SYSTEM_DLKM_SRC)/ $(TARGET_SYSTEM_DLKM_OUT)

	$(MKEROFS) "-zlz4hc" $@ $(TARGET_SYSTEM_DLKM_OUT)

	$(call assert-max-image-size,$@,$(BOARD_SYSTEM_DLKM_PARTITION_SIZE))

endif # BOARD_AVB_ENABLE



else # BUILDING_SYSTEM_DLKM_IMAGE is not true



ifdef BOARD_PREBUILT_SYSTEM_DLKM_IMAGE



INTERNAL_PREBUILT_SYSTEM_DLKM_IMAGE := $(BOARD_PREBUILT_SYSTEM_DLKM_IMAGE)

INSTALLED_SYSTEM_DLKM_IMAGE_TARGET := $(PRODUCT_OUT)/system_dlkm.img

$(INSTALLED_SYSTEM_DLKM_IMAGE_TARGET): $(INTERNAL_PREBUILT_SYSTEM_DLKM_IMAGE)

	$(call pretty,"Using prebuilt from: $(INTERNAL_PREBUILT_SYSTEM_DLKM_IMAGE)")

	cp $(INTERNAL_PREBUILT_SYSTEM_DLKM_IMAGE) $@



else # BOARD_PREBUILT_SYSTEM_DLKM_IMAGE not defined



INSTALLED_SYSTEM_DLKM_IMAGE_TARGET :=



endif # BOARD_PREBUILT_SYSTEM_DLKM_IMAGE



endif # BUILDING_SYSTEM_DLKM_IMAGE is not true



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

# vendor boot image

ifeq ($(BUILDING_VENDOR_BOOT_IMAGE),true)
@@ -1475,6 +1433,11 @@ target_odm_dlkm_notice_file_xml := $(TARGET_OUT_INTERMEDIATES)/NOTICE_ODM_DLKM.x 
target_odm_dlkm_notice_file_xml_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE_ODM_DLKM.xml.gz

installed_odm_dlkm_notice_xml_gz := $(TARGET_OUT_ODM_DLKM)/etc/NOTICE.xml.gz



target_system_dlkm_notice_file_txt := $(TARGET_OUT_INTERMEDIATES)/NOTICE_SYSTEM_DLKM.txt

target_system_dlkm_notice_file_xml := $(TARGET_OUT_INTERMEDIATES)/NOTICE_SYSTEM_DLKM.xml

target_system_dlkm_notice_file_xml_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE_SYSTEM_DLKM.xml.gz

installed_system_dlkm_notice_xml_gz := $(TARGET_OUT_SYSTEM_DLKM)/etc/NOTICE.xml.gz



# Notice files are copied to TARGET_OUT_NOTICE_FILES as a side-effect of their module

# being built. A notice xml file must depend on all modules that could potentially

# install a license file relevant to it.
@@ -1495,13 +1458,15 @@ license_modules_system_ext := $(filter $(TARGET_OUT_SYSTEM_EXT)/%,$(license_modu 
license_modules_odm := $(filter $(TARGET_OUT_ODM)/%,$(license_modules))

license_modules_vendor_dlkm := $(filter $(TARGET_OUT_VENDOR_DLKM)/%,$(license_modules))

license_modules_odm_dlkm := $(filter $(TARGET_OUT_ODM_DLKM)/%,$(license_modules))

license_modules_odm_dlkm := $(filter $(TARGET_OUT_SYSTEM_DLKM)/%,$(license_modules))

license_modules_agg := $(license_modules_system) \

                       $(license_modules_vendor) \

                       $(license_modules_product) \

                       $(license_modules_system_ext) \

                       $(license_modules_odm) \

                       $(license_modules_vendor_dlkm) \

                       $(license_modules_odm_dlkm)

                       $(license_modules_odm_dlkm) \

                       $(license_modules_system_dlkm)

# targets used for debug symbols only and do not get copied to the device

license_modules_symbols_only := $(filter $(PRODUCT_OUT)/apex/%,$(license_modules))
@@ -1593,6 +1558,13 @@ $(eval $(call combine-notice-files, xml_odm_dlkm, \ 
	        $(TARGET_OUT_NOTICE_FILES), \

	        $(license_modules_odm_dlkm), \

	        $(exclude_target_dirs)))

$(eval $(call combine-notice-files, xml_system_dlkm, \

	        $(target_system_dlkm_notice_file_txt), \

	        $(target_system_dlkm_notice_file_xml), \

	        "Notices for files contained in the system_dlkm filesystem image in this directory:", \

	        $(TARGET_OUT_NOTICE_FILES), \

	        $(license_modules_system_dlkm), \

	        $(exclude_target_dirs)))



$(target_notice_file_xml_gz): $(target_notice_file_xml) | $(MINIGZIP)

	$(hide) $(MINIGZIP) -9 < $< > $@
@@ -1608,6 +1580,8 @@ $(target_vendor_dlkm_notice_file_xml_gz): $(target_vendor_dlkm_notice_file_xml) 
	$(hide) $(MINIGZIP) -9 < $< > $@

$(target_odm_dlkm_notice_file_xml_gz): $(target_odm_dlkm_notice_file_xml) | $(MINIGZIP)

	$(hide) $(MINIGZIP) -9 < $< > $@

$(target_system_dlkm_notice_file_xml_gz): $(target_system_dlkm_notice_file_xml) | $(MINIGZIP)

	$(hide) $(MINIGZIP) -9 < $< > $@

$(installed_notice_html_or_xml_gz): $(target_notice_file_xml_gz)

	$(copy-file-to-target)

$(installed_vendor_notice_xml_gz): $(target_vendor_notice_file_xml_gz)
@@ -1622,6 +1596,8 @@ $(installed_vendor_dlkm_notice_xml_gz): $(target_vendor_dlkm_notice_file_xml_gz) 
	$(copy-file-to-target)

$(installed_odm_dlkm_notice_xml_gz): $(target_odm_dlkm_notice_file_xml_gz)

	$(copy-file-to-target)

$(installed_system_dlkm_notice_xml_gz): $(target_system_dlkm_notice_file_xml_gz)

	$(copy-file-to-target)



$(call declare-0p-target,$(target_notice_file_xml))

$(call declare-0p-target,$(target_notice_file_xml_gz))
@@ -1637,6 +1613,8 @@ $(call declare-0p-target,$(target_vendor_dlkm_notice_file_xml)) 
$(call declare-0p-target,$(target_vendor_dlkm_notice_file_xml_gz))

$(call declare-0p-target,$(target_odm_dlkm_notice_file_xml))

$(call declare-0p-target,$(target_odm_dlkm_notice_file_xml_gz))

$(call declare-0p-target,$(target_system_dlkm_notice_file_xml))

$(call declare-0p-target,$(target_system_dlkm_notice_file_xml_gz))

$(call declare-0p-target,$(installed_notice_html_or_xml_gz))

$(call declare-0p-target,$(installed_vendor_notice_xml_gz))

$(call declare-0p-target,$(installed_product_notice_xml_gz))
@@ -1644,6 +1622,7 @@ $(call declare-0p-target,$(installed_system_ext_notice_xml_gz)) 
$(call declare-0p-target,$(installed_odm_notice_xml_gz))

$(call declare-0p-target,$(installed_vendor_dlkm_notice_xml_gz))

$(call declare-0p-target,$(installed_odm_dlkm_notice_xml_gz))

$(call declare-0p-target,$(installed_sysetm_dlkm_notice_xml_gz))



ALL_DEFAULT_INSTALLED_MODULES += $(installed_notice_html_or_xml_gz)

ALL_DEFAULT_INSTALLED_MODULES += $(installed_vendor_notice_xml_gz)
@@ -1652,6 +1631,7 @@ ALL_DEFAULT_INSTALLED_MODULES += $(installed_system_ext_notice_xml_gz) 
ALL_DEFAULT_INSTALLED_MODULES += $(installed_odm_notice_xml_gz)

ALL_DEFAULT_INSTALLED_MODULES += $(installed_vendor_dlkm_notice_xml_gz)

ALL_DEFAULT_INSTALLED_MODULES += $(installed_odm_dlkm_notice_xml_gz)

ALL_DEFAULT_INSTALLED_MODULES += $(installed_system_dlkm_notice_xml_gz)

endif # PRODUCT_NOTICE_SPLIT



ALL_DEFAULT_INSTALLED_MODULES += $(installed_notice_html_or_xml_gz)
@@ -1729,6 +1709,7 @@ ifneq ($(filter \ 
    $(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE) \

    $(BOARD_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE) \

    $(BOARD_ODM_DLKMIMAGE_FILE_SYSTEM_TYPE) \

    $(BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE) \

  ,erofs),)

INTERNAL_USERIMAGES_DEPS += $(MKEROFSUSERIMG)

BOARD_EROFS_COMPRESSOR ?= "lz4hc,9"
@@ -1742,6 +1723,7 @@ ifneq ($(filter \ 
    $(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE) \

    $(BOARD_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE) \

    $(BOARD_ODM_DLKMIMAGE_FILE_SYSTEM_TYPE) \

    $(BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE) \

  ,squashfs),)

INTERNAL_USERIMAGES_DEPS += $(MKSQUASHFSUSERIMG)

endif
@@ -1813,7 +1795,7 @@ $(call add-common-flags-to-image-props,$(1),$(2)) 
endef



# $(1): the path of the output dictionary file

# $(2): a subset of "system vendor cache userdata product system_ext oem odm vendor_dlkm odm_dlkm"

# $(2): a subset of "system vendor cache userdata product system_ext oem odm vendor_dlkm odm_dlkm system_dlkm"

# $(3): additional "key=value" pairs to append to the dictionary file.

define generate-image-prop-dictionary

$(if $(filter $(2),system),\
@@ -1857,6 +1839,9 @@ $(if $(filter $(2),vendor_dlkm),\ 
$(if $(filter $(2),odm_dlkm),\

    $(call add-common-ro-flags-to-image-props,odm_dlkm,$(1))

)

$(if $(filter $(2),system_dlkm),\

    $(call add-common-ro-flags-to-image-props,system_dlkm,$(1))

)

$(if $(filter $(2),oem),\

    $(if $(BOARD_OEMIMAGE_PARTITION_SIZE),$(hide) echo "oem_size=$(BOARD_OEMIMAGE_PARTITION_SIZE)" >> $(1))

    $(if $(BOARD_OEMIMAGE_JOURNAL_SIZE),$(hide) echo "oem_journal_size=$(BOARD_OEMIMAGE_JOURNAL_SIZE)" >> $(1))
@@ -1889,6 +1874,7 @@ $(if $(PRODUCT_PRODUCT_VERITY_PARTITION),$(hide) echo "product_verity_block_devi 
$(if $(PRODUCT_SYSTEM_EXT_VERITY_PARTITION),$(hide) echo "system_ext_verity_block_device=$(PRODUCT_SYSTEM_EXT_VERITY_PARTITION)" >> $(1))

$(if $(PRODUCT_VENDOR_DLKM_VERITY_PARTITION),$(hide) echo "vendor_dlkm_verity_block_device=$(PRODUCT_VENDOR_DLKM_VERITY_PARTITION)" >> $(1))

$(if $(PRODUCT_ODM_DLKM_VERITY_PARTITION),$(hide) echo "odm_dlkm_verity_block_device=$(PRODUCT_ODM_DLKM_VERITY_PARTITION)" >> $(1))

$(if $(PRODUCT_SYSTEM_DLKM_VERITY_PARTITION),$(hide) echo "system_dlkm_verity_block_device=$(PRODUCT_SYSTEM_DLKM_VERITY_PARTITION)" >> $(1))

$(if $(PRODUCT_SUPPORTS_VBOOT),$(hide) echo "vboot=$(PRODUCT_SUPPORTS_VBOOT)" >> $(1))

$(if $(PRODUCT_SUPPORTS_VBOOT),$(hide) echo "vboot_key=$(PRODUCT_VBOOT_SIGNING_KEY)" >> $(1))

$(if $(PRODUCT_SUPPORTS_VBOOT),$(hide) echo "vboot_subkey=$(PRODUCT_VBOOT_SIGNING_SUBKEY)" >> $(1))
@@ -1953,6 +1939,14 @@ $(if $(BOARD_AVB_ENABLE),\ 
        $(hide) echo "avb_odm_dlkm_key_path=$(BOARD_AVB_ODM_DLKM_KEY_PATH)" >> $(1)

        $(hide) echo "avb_odm_dlkm_algorithm=$(BOARD_AVB_ODM_DLKM_ALGORITHM)" >> $(1)

        $(hide) echo "avb_odm_dlkm_rollback_index_location=$(BOARD_AVB_ODM_DLKM_ROLLBACK_INDEX_LOCATION)" >> $(1)))

$(if $(BOARD_AVB_ENABLE),$(hide) echo "avb_system_dlkm_hashtree_enable=$(BOARD_AVB_ENABLE)" >> $(1))

$(if $(BOARD_AVB_ENABLE),\

    $(hide) echo "avb_system_dlkm_add_hashtree_footer_args=$(BOARD_AVB_SYSTEM_DLKM_ADD_HASHTREE_FOOTER_ARGS)" >> $(1))

$(if $(BOARD_AVB_ENABLE),\

    $(if $(BOARD_AVB_SYSTEM_DLKM_KEY_PATH),\

        $(hide) echo "avb_system_dlkm_key_path=$(BOARD_AVB_SYSTEM_DLKM_KEY_PATH)" >> $(1)

        $(hide) echo "avb_system_dlkm_algorithm=$(BOARD_AVB_SYSTEM_DLKM_ALGORITHM)" >> $(1)

        $(hide) echo "avb_system_dlkm_rollback_index_location=$(BOARD_SYSTEM_SYSTEM_DLKM_ROLLBACK_INDEX_LOCATION)" >> $(1)))

$(if $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)),\

    $(hide) echo "recovery_as_boot=true" >> $(1))

$(if $(filter true,$(BOARD_BUILD_SYSTEM_ROOT_IMAGE)),\
@@ -1996,6 +1990,9 @@ endif 
ifdef BUILDING_ODM_DLKM_IMAGE

  PROP_DICTIONARY_IMAGES += odm_dlkm

endif

ifdef BUILDING_SYSTEM_DLKM_IMAGE

  PROP_DICTIONARY_IMAGES += system_dlkm

endif

define generate-userimage-prop-dictionary

  $(call generate-image-prop-dictionary,$(1),$(PROP_DICTIONARY_IMAGES),$(2))

endef
@@ -2923,7 +2920,7 @@ endif 
# On devices with a system_dlkm partition,

# - /system/lib/modules is a symlink to a directory that stores system DLKMs.

# - The system_dlkm partition is mounted at /system_dlkm at runtime.

ifdef BOARD_USES_SYSTEM_DLKM_PARTITION

ifdef BOARD_USES_SYSTEM_DLKMIMAGE

  INTERNAL_SYSTEMIMAGE_FILES += $(call create-partition-compat-symlink,$(TARGET_OUT)/lib/modules,/system_dlkm/lib/modules,system_dlkm.img)

endif
@@ -3618,6 +3615,60 @@ INSTALLED_ODM_DLKMIMAGE_TARGET := $(PRODUCT_OUT)/odm_dlkm.img 
$(eval $(call copy-one-file,$(BOARD_PREBUILT_ODM_DLKMIMAGE),$(INSTALLED_ODM_DLKMIMAGE_TARGET)))

endif



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

# system_dlkm partition image



ifdef BUILDING_SYSTEM_DLKM_IMAGE



INTERNAL_SYSTEM_DLKMIMAGE_FILES := \

    $(filter $(TARGET_OUT_SYSTEM_DLKM)/%,\

      $(ALL_DEFAULT_INSTALLED_MODULES))



INSTALLED_FILES_FILE_SYSTEM_DLKM := $(PRODUCT_OUT)/installed-files-system_dlkm.txt

INSTALLED_FILES_JSON_SYSTEM_DLKM := $(INSTALLED_FILES_FILE_SYSTEM_DLKM:.txt=.json)

$(INSTALLED_FILES_FILE_SYSTEM_DLKM): .KATI_IMPLICIT_OUTPUTS := $(INSTALLED_FILES_JSON_SYSTEM_DLKM)

$(INSTALLED_FILES_FILE_SYSTEM_DLKM): $(INTERNAL_SYSTEM_DLKMIMAGE_FILES) $(FILESLIST) $(FILESLIST_UTIL)

	@echo Installed file list: $@

	mkdir -p $(dir $@)

	if [ -d "$(BOARD_SYSTEM_DLKM_SRC)" ]; then rsync -rupE $(BOARD_SYSTEM_DLKM_SRC)/ $(TARGET_OUT_SYSTEM_DLKM); fi

	rm -f $@

	$(FILESLIST) $(TARGET_OUT_SYSTEM_DLKM) > $(@:.txt=.json)

	$(FILESLIST_UTIL) -c $(@:.txt=.json) > $@



system_dlkmimage_intermediates := \

    $(call intermediates-dir-for,PACKAGING,system_dlkm)

BUILT_SYSTEM_DLKMIMAGE_TARGET := $(PRODUCT_OUT)/system_dlkm.img

define build-system_dlkmimage-target

  $(call pretty,"Target system_dlkm fs image: $(INSTALLED_SYSTEM_DLKMIMAGE_TARGET)")

  @mkdir -p $(TARGET_OUT_SYSTEM_DLKM)

  @mkdir -p $(system_dlkmimage_intermediates) && rm -rf $(system_dlkmimage_intermediates)/system_dlkm_image_info.txt

  $(call generate-image-prop-dictionary, $(system_dlkmimage_intermediates)/system_dlkm_image_info.txt, \

	  system_dlkm, skip_fsck=true)

  PATH=$(INTERNAL_USERIMAGES_BINARY_PATHS):$$PATH \

      $(BUILD_IMAGE) \

          $(TARGET_OUT_SYSTEM_DLKM) $(system_dlkmimage_intermediates)/system_dlkm_image_info.txt \

          $(INSTALLED_SYSTEM_DLKMIMAGE_TARGET) $(TARGET_OUT)

  $(call assert-max-image-size,$(INSTALLED_SYSTEM_DLKMIMAGE_TARGET),$(BOARD_SYSTEM_DLKMIMAGE_PARTITION_SIZE))

endef



# We just build this directly to the install location.

INSTALLED_SYSTEM_DLKMIMAGE_TARGET := $(BUILT_SYSTEM_DLKMIMAGE_TARGET)

$(INSTALLED_SYSTEM_DLKMIMAGE_TARGET): \

    $(INTERNAL_USERIMAGES_DEPS) \

    $(INTERNAL_SYSTEM_DLKMIMAGE_FILES) \

    $(INSTALLED_FILES_FILE_SYSTEM_DLKM)

	$(build-system_dlkmimage-target)



.PHONY: system_dlkmimage-nodeps sdnod

system_dlkmimage-nodeps sdnod: | $(INTERNAL_USERIMAGES_DEPS)

	$(build-system_dlkmimage-target)



sync: $(INTERNAL_SYSTEM_DLKMIMAGE_FILES)



else ifdef BOARD_PREBUILT_SYSTEM_DLKMIMAGE

INSTALLED_SYSTEM_DLKMIMAGE_TARGET := $(PRODUCT_OUT)/system_dlkm.img

$(eval $(call copy-one-file,$(BOARD_PREBUILT_SYSTEM_DLKMIMAGE),$(INSTALLED_SYSTEM_DLKMIMAGE_TARGET)))

endif



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

# dtbo image
@@ -3673,8 +3724,7 @@ define images-for-partitions 
$(strip $(foreach item,$(1),\

  $(if $(filter $(item),system_other),$(INSTALLED_SYSTEMOTHERIMAGE_TARGET),\

    $(if $(filter $(item),init_boot),$(INSTALLED_INIT_BOOT_IMAGE_TARGET),\

      $(if $(filter $(item),system_dlkm),$(INSTALLED_SYSTEM_DLKM_IMAGE_TARGET),\

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

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

endef



# -----------------------------------------------------------------
@@ -3817,6 +3867,10 @@ BOARD_AVB_ODM_DLKM_ADD_HASHTREE_FOOTER_ARGS += \ 
    --prop com.android.build.odm_dlkm.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \

    --prop com.android.build.odm_dlkm.os_version:$(PLATFORM_VERSION_LAST_STABLE)



BOARD_AVB_SYSTEM_DLKM_ADD_HASHTREE_FOOTER_ARGS += \

    --prop com.android.build.system_dlkm.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \

    --prop com.android.build.system_dlkm.os_version:$(PLATFORM_VERSION_LAST_STABLE)



BOARD_AVB_DTBO_ADD_HASH_FOOTER_ARGS += \

    --prop com.android.build.dtbo.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE)
@@ -3859,6 +3913,11 @@ BOARD_AVB_ODM_DLKM_ADD_HASHTREE_FOOTER_ARGS += \ 
    --prop com.android.build.odm_dlkm.security_patch:$(ODM_DLKM_SECURITY_PATCH)

endif



ifdef SYSTEM_DLKM_SECURITY_PATCH

BOARD_AVB_SYSTEM_DLKM_ADD_HASHTREE_FOOTER_ARGS += \

    --prop com.android.build.system_dlkm.security_patch:$(SYSTEM_DLKM_SECURITY_PATCH)

endif



ifdef PVMFW_SECURITY_PATCH

BOARD_AVB_PVMFW_ADD_HASH_FOOTER_ARGS += \

    --prop com.android.build.pvmfw.security_patch:$(PVMFW_SECURITY_PATCH)
@@ -3884,6 +3943,7 @@ SYSTEM_EXT_FOOTER_ARGS := BOARD_AVB_SYSTEM_EXT_ADD_HASHTREE_FOOTER_ARGS 
ODM_FOOTER_ARGS := BOARD_AVB_ODM_ADD_HASHTREE_FOOTER_ARGS

VENDOR_DLKM_FOOTER_ARGS := BOARD_AVB_VENDOR_DLKM_ADD_HASHTREE_FOOTER_ARGS

ODM_DLKM_FOOTER_ARGS := BOARD_AVB_ODM_DLKM_ADD_HASHTREE_FOOTER_ARGS

SYSTEM_DLKM_FOOTER_ARGS := BOARD_AVB_SYSTEM_DLKM_ADD_HASHTREE_FOOTER_ARGS



# Helper function that checks and sets required build variables for an AVB chained partition.

# $(1): the partition to enable AVB chain, e.g., boot or system or vbmeta_system.
@@ -3992,6 +4052,10 @@ ifdef INSTALLED_ODM_DLKMIMAGE_TARGET 
$(eval $(call check-and-set-avb-args,odm_dlkm))

endif



ifdef INSTALLED_SYSTEM_DLKMIMAGE_TARGET

$(eval $(call check-and-set-avb-args,system_dlkm))

endif



ifdef INSTALLED_DTBOIMAGE_TARGET

$(eval $(call check-and-set-avb-args,dtbo))

endif
@@ -4085,6 +4149,9 @@ define extract-avb-chain-public-keys 
  $(if $(BOARD_AVB_ODM_DLKM_KEY_PATH),\

    $(hide) $(AVBTOOL) extract_public_key --key $(BOARD_AVB_ODM_DLKM_KEY_PATH) \

      --output $(1)/odm_dlkm.avbpubkey)

  $(if $(BOARD_AVB_SYSTEM_DLKM_KEY_PATH),\

    $(hide) $(AVBTOOL) extract_public_key --key $(BOARD_AVB_SYSTEM_DLKM_KEY_PATH) \

      --output $(1)/system_dlkm.avbpubkey)

  $(if $(BOARD_AVB_DTBO_KEY_PATH),\

    $(hide) $(AVBTOOL) extract_public_key --key $(BOARD_AVB_DTBO_KEY_PATH) \

      --output $(1)/dtbo.avbpubkey)
@@ -4173,6 +4240,7 @@ $(INSTALLED_VBMETAIMAGE_TARGET): \ 
	    $(INSTALLED_ODMIMAGE_TARGET) \

	    $(INSTALLED_VENDOR_DLKMIMAGE_TARGET) \

	    $(INSTALLED_ODM_DLKMIMAGE_TARGET) \

	    $(INSTALLED_SYSTEM_DLKMIMAGE_TARGET) \

	    $(INSTALLED_DTBOIMAGE_TARGET) \

	    $(INSTALLED_PVMFWIMAGE_TARGET) \

	    $(INSTALLED_CUSTOMIMAGES_TARGET) \
@@ -4204,11 +4272,12 @@ INTERNAL_ALLIMAGES_FILES := \ 
    $(INTERNAL_ODMIMAGE_FILES) \

    $(INTERNAL_VENDOR_DLKMIMAGE_FILES) \

    $(INTERNAL_ODM_DLKMIMAGE_FILES) \

    $(INTERNAL_SYSTEM_DLKMIMAGE_FILES) \



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

# Check VINTF of build



# Note: vendor_dlkm and odm_dlkm does not have VINTF files.

# Note: vendor_dlkm, odm_dlkm, and system_dlkm does not have VINTF files.

ifeq (,$(TARGET_BUILD_UNBUNDLED))



intermediates := $(call intermediates-dir-for,PACKAGING,check_vintf_all)
@@ -4741,10 +4810,6 @@ ifneq ($(INSTALLED_INIT_BOOT_IMAGE_TARGET),) 
	$(hide) echo "init_boot=true" >> $@

	$(hide) echo "init_boot_size=$(BOARD_INIT_BOOT_IMAGE_PARTITION_SIZE)" >> $@

endif

ifneq ($(INSTALLED_SYSTEM_DLKM_IMAGE_TARGET),)

	$(hide) echo "system_dlkm=true" >> $@

	$(hide) echo "system_dlkm_size=$(BOARD_SYSTEM_DLKM_PARTITION_SIZE)" >> $@

endif

ifeq ($(BOARD_RAMDISK_USE_LZ4),true)

	echo "lz4_ramdisks=true" >> $@

endif
@@ -5045,13 +5110,17 @@ endef 
define filter-out-missing-odm_dlkm

$(if $(INSTALLED_ODM_DLKMIMAGE_TARGET),$(1),$(filter-out odm_dlkm,$(1)))

endef

# Filter out vendor,vendor_dlkm,odm,odm_dlkm from the list for AOSP targets.

define filter-out-missing-system_dlkm

$(if $(INSTALLED_SYSTEM_DLKMIMAGE_TARGET),$(1),$(filter-out system_dlkm,$(1)))

endef

# Filter out vendor,vendor_dlkm,odm,odm_dlkm,system_dlkm from the list for AOSP targets.

# $(1): list

define filter-out-missing-partitions

$(call filter-out-missing-vendor,\

  $(call filter-out-missing-vendor_dlkm,\

    $(call filter-out-missing-odm,\

      $(call filter-out-missing-odm_dlkm,$(1)))))

      $(call filter-out-missing-odm_dlkm,\

        $(call filter-out-missing-system_dlkm,$(1))))))

endef



# Information related to dynamic partitions and virtual A/B. This information
@@ -5195,6 +5264,12 @@ else ifdef BOARD_PREBUILT_ODM_DLKMIMAGE 
  $(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_ODM_DLKMIMAGE_TARGET)

endif



ifdef BUILDING_SYSTEM_DLKM_IMAGE

  $(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_SYSTEM_DLKMIMAGE_FILES)

else ifdef BOARD_PREBUILT_SYSTEM_DLKMIMAGE

  $(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_SYSTEM_DLKMIMAGE_TARGET)

endif



ifeq ($(BUILD_QEMU_IMAGES),true)

  MK_VBMETA_BOOT_KERNEL_CMDLINE_SH := device/generic/goldfish/tools/mk_vbmeta_boot_params.sh

  $(BUILT_TARGET_FILES_PACKAGE): $(MK_VBMETA_BOOT_KERNEL_CMDLINE_SH)
@@ -5229,6 +5304,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \ 
	    $(PRODUCT_ODM_BASE_FS_PATH) \

	    $(PRODUCT_VENDOR_DLKM_BASE_FS_PATH) \

	    $(PRODUCT_ODM_DLKM_BASE_FS_PATH) \

	    $(PRODUCT_SYSTEM_DLKM_BASE_FS_PATH) \

	    $(LPMAKE) \

	    $(SELINUX_FC) \

	    $(INSTALLED_MISC_INFO_TARGET) \
@@ -5402,6 +5478,11 @@ ifdef BUILDING_ODM_DLKM_IMAGE 
	$(hide) $(call package_files-copy-root, \

	    $(TARGET_OUT_ODM_DLKM),$(zip_root)/ODM_DLKM)

endif

ifdef BUILDING_SYSTEM_DLKM_IMAGE

	@# Contents of the system_dlkm image

	$(hide) $(call package_files-copy-root, \

	    $(TARGET_OUT_SYSTEM_DLKM),$(zip_root)/SYSTEM_DLKM)

endif

ifdef BUILDING_SYSTEM_OTHER_IMAGE

	@# Contents of the system_other image

	$(hide) $(call package_files-copy-root, \
@@ -5462,6 +5543,10 @@ ifneq ($(PRODUCT_ODM_DLKM_BASE_FS_PATH),) 
	$(hide) cp $(PRODUCT_ODM_DLKM_BASE_FS_PATH) \

	  $(zip_root)/META/$(notdir $(PRODUCT_ODM_DLKM_BASE_FS_PATH))

endif

ifneq ($(PRODUCT_SYSTEM_DLKM_BASE_FS_PATH),)

	$(hide) cp $(PRODUCT_SYSTEM_DLKM_BASE_FS_PATH) \

	  $(zip_root)/META/$(notdir $(PRODUCT_SYSTEM_DLKM_BASE_FS_PATH))

endif

ifeq ($(TARGET_OTA_ALLOW_NON_AB),true)

ifneq ($(INSTALLED_RECOVERYIMAGE_TARGET),)

	$(hide) PATH=$(INTERNAL_USERIMAGES_BINARY_PATHS):$$PATH MKBOOTIMG=$(MKBOOTIMG) \
@@ -5505,15 +5590,6 @@ ifdef BOARD_PREBUILT_INIT_BOOT_IMAGE 
	$(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES

	$(hide) cp $(INSTALLED_INIT_BOOT_IMAGE_TARGET) $(zip_root)/PREBUILT_IMAGES/

endif

ifdef BOARD_PREBUILT_SYSTEM_DLKM_IMAGE

	$(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES

	$(hide) cp $(INSTALLED_SYSTEM_DLKM_IMAGE_TARGET) $(zip_root)/PREBUILT_IMAGES

else # BOARD_PREBUILT_SYSTEM_DLKM_IMAGE is not define

ifdef INSTALLED_SYSTEM_DLKM_IMAGE_TARGET

	$(hide) mkdir -p $(zip_root)/IMAGES

	$(hide) cp $(INSTALLED_SYSTEM_DLKM_IMAGE_TARGET) $(zip_root)/IMAGES/

endif # INSTALLED_SYSTEM_DLKM_IMAGE_TARGET

endif # BOARD_PREBUILT_SYSTEM_DLKM_IMAGE



ifndef BOARD_PREBUILT_BOOTIMAGE

ifneq (,$(strip $(INTERNAL_PREBUILT_BOOTIMAGE) $(filter true,$(BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES))))
@@ -5538,6 +5614,10 @@ ifdef BOARD_PREBUILT_ODM_DLKMIMAGE 
	$(hide) mkdir -p $(zip_root)/IMAGES

	$(hide) cp $(INSTALLED_ODM_DLKMIMAGE_TARGET) $(zip_root)/IMAGES/

endif

ifdef BOARD_PREBUILT_SYSTEM_DLKMIMAGE

	$(hide) mkdir -p $(zip_root)/IMAGES

	$(hide) cp $(INSTALLED_SYSTEM_DLKMIMAGE_TARGET) $(zip_root)/IMAGES/

endif

ifdef BOARD_PREBUILT_DTBOIMAGE

	$(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES

	$(hide) cp $(INSTALLED_DTBOIMAGE_TARGET) $(zip_root)/PREBUILT_IMAGES/
@@ -5582,6 +5662,9 @@ ifdef BUILDING_VENDOR_DLKM_IMAGE 
endif

ifdef BUILDING_ODM_DLKM_IMAGE

	$(hide) $(call fs_config,$(zip_root)/ODM_DLKM,odm_dlkm/) > $(zip_root)/META/odm_dlkm_filesystem_config.txt

endif

ifdef BUILDING_SYSTEM_DLKM_IMAGE

	$(hide) $(call fs_config,$(zip_root)/SYSTEM_DLKM,system_dlkm/) > $(zip_root)/META/system_dlkm_filesystem_config.txt

endif

	@# ROOT always contains the files for the root under normal boot.

	$(hide) $(call fs_config,$(zip_root)/ROOT,) > $(zip_root)/META/root_filesystem_config.txt
@@ -5596,9 +5679,6 @@ ifdef BOARD_KERNEL_PAGESIZE 
	$(hide) echo "$(BOARD_KERNEL_PAGESIZE)" > $(zip_root)/INIT_BOOT/pagesize

endif # BOARD_KERNEL_PAGESIZE

endif # BUILDING_INIT_BOOT_IMAGE

ifdef BUILDING_SYSTEM_DLKM_IMAGE

	$(hide) $(call package_files-copy-root, $(TARGET_SYSTEM_DLKM_OUT),$(zip_root)/SYSTEM_DLKM)

endif

ifneq ($(INSTALLED_VENDOR_BOOTIMAGE_TARGET),)

	$(call fs_config,$(zip_root)/VENDOR_BOOT/RAMDISK,) > $(zip_root)/META/vendor_boot_filesystem_config.txt

endif
@@ -5913,7 +5993,6 @@ $(PROGUARD_USAGE_ZIP): \ 
    $(INSTALLED_RAMDISK_TARGET) \

    $(INSTALLED_BOOTIMAGE_TARGET) \

    $(INSTALLED_INIT_BOOT_IMAGE_TARGET) \

    $(INSTALLED_SYSTEM_DLKM_IMAGE_TARGET) \

    $(INSTALLED_USERDATAIMAGE_TARGET) \

    $(INSTALLED_VENDORIMAGE_TARGET) \

    $(INSTALLED_PRODUCTIMAGE_TARGET) \
@@ -5921,6 +6000,7 @@ $(PROGUARD_USAGE_ZIP): \ 
    $(INSTALLED_ODMIMAGE_TARGET) \

    $(INSTALLED_VENDOR_DLKMIMAGE_TARGET) \

    $(INSTALLED_ODM_DLKMIMAGE_TARGET) \

    $(INSTALLED_SYSTEM_DLKMIMAGE_TARGET) \

    $(updater_dep)

endif

$(PROGUARD_USAGE_ZIP): PRIVATE_LIST_FILE := $(call intermediates-dir-for,PACKAGING,proguard_usage.zip)/filelist
@@ -6175,6 +6255,16 @@ odm_dlkmimage: $(INSTALLED_QEMU_ODM_DLKMIMAGE) 
droidcore-unbundled: $(INSTALLED_QEMU_ODM_DLKMIMAGE)

endif



ifdef INSTALLED_SYSTEM_DLKMIMAGE_TARGET

INSTALLED_QEMU_SYSTEM_DLKMIMAGE := $(PRODUCT_OUT)/system_dlkm-qemu.img

$(INSTALLED_QEMU_SYSTEM_DLKMIMAGE): $(INSTALLED_SYSTEM_DLKMIMAGE_TARGET) $(MK_QEMU_IMAGE_SH) $(SGDISK_HOST)

	@echo Create system_dlkm-qemu.img

	(export SGDISK=$(SGDISK_HOST); $(MK_QEMU_IMAGE_SH) $(INSTALLED_SYSTEM_DLKMIMAGE_TARGET))



system_dlkmimage: $(INSTALLED_QEMU_SYSTEM_DLKMIMAGE)

droidcore-unbundled: $(INSTALLED_QEMU_SYSTEM_DLKMIMAGE)

endif



QEMU_VERIFIED_BOOT_PARAMS := $(PRODUCT_OUT)/VerifiedBootParams.textproto

$(QEMU_VERIFIED_BOOT_PARAMS): $(INSTALLED_VBMETAIMAGE_TARGET) $(INSTALLED_SYSTEMIMAGE_TARGET) \

    $(MK_VBMETA_BOOT_KERNEL_CMDLINE_SH) $(AVBTOOL)

core/board_config.mk

+37 −32

File changed.

Preview size limit exceeded, changes collapsed.

core/config.mk

+8 −1
Original line number Diff line number Diff line
@@ -929,6 +929,13 @@ $(error Should not define BOARD_ODM_DLKMIMAGE_PARTITION_SIZE and \ 
endif

endif



ifneq ($(BOARD_SYSTEM_DLKMIMAGE_PARTITION_SIZE),)

ifneq ($(BOARD_SYSTEM_DLKMIMAGE_PARTITION_RESERVED_SIZE),)

$(error Should not define BOARD_SYSTEM_DLKMIMAGE_PARTITION_SIZE and \

    BOARD_SYSTEM_DLKMIMAGE_PARTITION_RESERVED_SIZE together)

endif

endif



ifneq ($(BOARD_PRODUCTIMAGE_PARTITION_SIZE),)

ifneq ($(BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE),)

$(error Should not define BOARD_PRODUCTIMAGE_PARTITION_SIZE and \
@@ -964,7 +971,7 @@ $(foreach group,$(call to-upper,$(BOARD_SUPER_PARTITION_GROUPS)), \ 
)



# BOARD_*_PARTITION_LIST: a list of the following tokens

valid_super_partition_list := system vendor product system_ext odm vendor_dlkm odm_dlkm

valid_super_partition_list := system vendor product system_ext odm vendor_dlkm odm_dlkm system_dlkm

$(foreach group,$(call to-upper,$(BOARD_SUPER_PARTITION_GROUPS)), \

    $(if $(filter-out $(valid_super_partition_list),$(BOARD_$(group)_PARTITION_LIST)), \

        $(error BOARD_$(group)_PARTITION_LIST contains invalid partition name \

core/envsetup.mk

+32 −0

File changed.

Preview size limit exceeded, changes collapsed.

core/main.mk

+10 −5
Original line number Diff line number Diff line
@@ -1209,7 +1209,8 @@ define resolve-product-relative-paths 
        $(subst $(_odm_path_placeholder),$(TARGET_COPY_OUT_ODM),\

          $(subst $(_vendor_dlkm_path_placeholder),$(TARGET_COPY_OUT_VENDOR_DLKM),\

            $(subst $(_odm_dlkm_path_placeholder),$(TARGET_COPY_OUT_ODM_DLKM),\

              $(foreach p,$(1),$(call append-path,$(PRODUCT_OUT),$(p)$(2)))))))))

              $(subst $(_system_dlkm_path_placeholder),$(TARGET_COPY_OUT_SYSTEM_DLKM),\

                $(foreach p,$(1),$(call append-path,$(PRODUCT_OUT),$(p)$(2))))))))))

endef



# Returns modules included automatically as a result of certain BoardConfig
@@ -1594,6 +1595,9 @@ vendor_dlkmimage: $(INSTALLED_VENDOR_DLKMIMAGE_TARGET) 
.PHONY: odm_dlkmimage

odm_dlkmimage: $(INSTALLED_ODM_DLKMIMAGE_TARGET)



.PHONY: system_dlkmimage

system_dlkmimage: $(INSTALLED_SYSTEM_DLKMIMAGE_TARGET)



.PHONY: systemotherimage

systemotherimage: $(INSTALLED_SYSTEMOTHERIMAGE_TARGET)
@@ -1606,9 +1610,6 @@ bootimage: $(INSTALLED_BOOTIMAGE_TARGET) 
.PHONY: initbootimage

initbootimage: $(INSTALLED_INIT_BOOT_IMAGE_TARGET)



.PHONY: system_dlkm_image

system_dlkm_image: $(INSTALLED_SYSTEM_DLKM_IMAGE_TARGET)



ifeq (true,$(PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST))

$(call dist-for-goals, bootimage, $(INSTALLED_BOOTIMAGE_TARGET))

endif
@@ -1633,7 +1634,6 @@ vbmetavendorimage: $(INSTALLED_VBMETA_VENDORIMAGE_TARGET) 
.PHONY: droidcore-unbundled

droidcore-unbundled: $(filter $(HOST_OUT_ROOT)/%,$(modules_to_install)) \

    $(INSTALLED_SYSTEMIMAGE_TARGET) \

    $(INSTALLED_SYSTEM_DLKM_IMAGE_TARGET) \

    $(INSTALLED_RAMDISK_TARGET) \

    $(INSTALLED_BOOTIMAGE_TARGET) \

    $(INSTALLED_INIT_BOOT_IMAGE_TARGET) \
@@ -1657,6 +1657,7 @@ droidcore-unbundled: $(filter $(HOST_OUT_ROOT)/%,$(modules_to_install)) \ 
    $(INSTALLED_ODMIMAGE_TARGET) \

    $(INSTALLED_VENDOR_DLKMIMAGE_TARGET) \

    $(INSTALLED_ODM_DLKMIMAGE_TARGET) \

    $(INSTALLED_SYSTEM_DLKMIMAGE_TARGET) \

    $(INSTALLED_SUPERIMAGE_EMPTY_TARGET) \

    $(INSTALLED_PRODUCTIMAGE_TARGET) \

    $(INSTALLED_SYSTEMOTHERIMAGE_TARGET) \
@@ -1672,6 +1673,8 @@ droidcore-unbundled: $(filter $(HOST_OUT_ROOT)/%,$(modules_to_install)) \ 
    $(INSTALLED_FILES_JSON_VENDOR_DLKM) \

    $(INSTALLED_FILES_FILE_ODM_DLKM) \

    $(INSTALLED_FILES_JSON_ODM_DLKM) \

    $(INSTALLED_FILES_FILE_SYSTEM_DLKM) \

    $(INSTALLED_FILES_JSON_SYSTEM_DLKM) \

    $(INSTALLED_FILES_FILE_PRODUCT) \

    $(INSTALLED_FILES_JSON_PRODUCT) \

    $(INSTALLED_FILES_FILE_SYSTEM_EXT) \
@@ -1822,6 +1825,8 @@ else ifeq ($(TARGET_BUILD_UNBUNDLED),$(TARGET_BUILD_UNBUNDLED_IMAGE)) 
    $(INSTALLED_FILES_JSON_VENDOR_DLKM) \

    $(INSTALLED_FILES_FILE_ODM_DLKM) \

    $(INSTALLED_FILES_JSON_ODM_DLKM) \

    $(INSTALLED_FILES_FILE_SYSTEM_DLKM) \

    $(INSTALLED_FILES_JSON_SYSTEM_DLKM) \

    $(INSTALLED_FILES_FILE_PRODUCT) \

    $(INSTALLED_FILES_JSON_PRODUCT) \

    $(INSTALLED_FILES_FILE_SYSTEM_EXT) \