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

Commit 0ea2b149 authored by Bowgo Tsai's avatar Bowgo Tsai Committed by android-build-merger
Browse files

Merge "Add support for /odm partition" 

am: c272a99b

Change-Id: I13e627cee909a09e0ada9f841f72c79803e765b7
parents 346034da c272a99b

core/Makefile

+183 −7
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ $(strip $(subst _,-, $(firstword $(1)))) 
endef



BUILDINFO_SH := build/make/tools/buildinfo.sh

VENDOR_BUILDINFO_SH := build/make/tools/vendor_buildinfo.sh

DEVICE_BUILDINFO_SH := build/make/tools/device_buildinfo.sh



# TARGET_BUILD_FLAVOR and ro.build.flavor are used only by the test

# harness to distinguish builds. Only add _asan for a sanitized build
@@ -410,7 +410,7 @@ FINAL_VENDOR_BUILD_PROPERTIES := $(call uniq-pairs-by-first-component, \ 
    $(FINAL_VENDOR_BUILD_PROPERTIES),=)

endif  # property_overrides_split_enabled



$(INSTALLED_VENDOR_BUILD_PROP_TARGET): $(VENDOR_BUILDINFO_SH) $(intermediate_system_build_prop)

$(INSTALLED_VENDOR_BUILD_PROP_TARGET): $(DEVICE_BUILDINFO_SH) $(intermediate_system_build_prop)

	@echo Target vendor buildinfo: $@

	@mkdir -p $(dir $@)

	$(hide) echo > $@
@@ -435,7 +435,7 @@ $(INSTALLED_VENDOR_BUILD_PROP_TARGET): $(VENDOR_BUILDINFO_SH) $(intermediate_sys 
			PRODUCT_MANUFACTURER="$(PRODUCT_MANUFACTURER)" \

			TARGET_BOOTLOADER_BOARD_NAME="$(TARGET_BOOTLOADER_BOARD_NAME)" \

			TARGET_BOARD_PLATFORM="$(TARGET_BOARD_PLATFORM)" \

	        bash $(VENDOR_BUILDINFO_SH) >> $@

	        bash $(DEVICE_BUILDINFO_SH) "vendor" >> $@

ifdef property_overrides_split_enabled

	$(hide) echo "#" >> $@; \

	        echo "# ADDITIONAL VENDOR BUILD PROPERTIES" >> $@; \
@@ -472,6 +472,39 @@ endif # BOARD_USES_PRODUCTIMAGE 
	$(hide) build/make/tools/post_process_props.py $@



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

# odm build.prop

INSTALLED_ODM_BUILD_PROP_TARGET := $(TARGET_OUT_ODM)/build.prop

ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_ODM_BUILD_PROP_TARGET)



FINAL_ODM_BUILD_PROPERTIES += \

    $(call collapse-pairs, $(PRODUCT_ODM_PROPERTIES))

FINAL_ODM_BUILD_PROPERTIES := $(call uniq-pairs-by-first-component, \

    $(FINAL_ODM_BUILD_PROPERTIES),=)



$(INSTALLED_ODM_BUILD_PROP_TARGET): $(DEVICE_BUILDINFO_SH)

	@echo Target odm buildinfo: $@

	@mkdir -p $(dir $@)

	$(hide) echo > $@

	$(hide) echo ro.odm.build.date=`$(DATE_FROM_FILE)`>>$@

	$(hide) echo ro.odm.build.date.utc=`$(DATE_FROM_FILE) +%s`>>$@

	$(hide) echo ro.odm.build.fingerprint="$(BUILD_FINGERPRINT_FROM_FILE)">>$@

	$(hide) echo ro.odm.product.cpu.abilist="$(TARGET_CPU_ABI_LIST)">>$@

	$(hide) echo ro.odm.product.cpu.abilist32="$(TARGET_CPU_ABI_LIST_32_BIT)">>$@

	$(hide) echo ro.odm.product.cpu.abilist64="$(TARGET_CPU_ABI_LIST_64_BIT)">>$@

	$(hide) TARGET_DEVICE="$(TARGET_DEVICE)" \

			PRODUCT_NAME="$(TARGET_PRODUCT)" \

			PRODUCT_BRAND="$(PRODUCT_BRAND)" \

			PRODUCT_MODEL="$(PRODUCT_MODEL)" \

			PRODUCT_MANUFACTURER="$(PRODUCT_MANUFACTURER)" \

			TARGET_BOOTLOADER_BOARD_NAME="$(TARGET_BOOTLOADER_BOARD_NAME)" \

			TARGET_BOARD_PLATFORM="$(TARGET_BOARD_PLATFORM)" \

	        bash $(DEVICE_BUILDINFO_SH) "odm" >> $@

	$(hide) echo "#" >> $@; \

	        echo "# ADDITIONAL ODM BUILD PROPERTIES" >> $@; \

	        echo "#" >> $@;

	$(hide) $(foreach line,$(FINAL_ODM_BUILD_PROPERTIES), \

		echo "$(line)" >> $@;)

	$(hide) build/make/tools/post_process_props.py $@



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

# product-services build.prop
@@ -1131,7 +1164,7 @@ endif 
ifneq (true,$(TARGET_USERIMAGES_SPARSE_SQUASHFS_DISABLED))

  INTERNAL_USERIMAGES_SPARSE_SQUASHFS_FLAG := -s

endif

ifneq ($(filter $(BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE) $(BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE) $(BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE) $(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),squashfs),)

ifneq ($(filter $(BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE) $(BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE) $(BOARD_ODMIMAGE_FILE_SYSTEM_TYPE) $(BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE) $(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),squashfs),)

INTERNAL_USERIMAGES_DEPS += $(MAKE_SQUASHFS) $(MKSQUASHFSUSERIMG) $(IMG2SIMG)

endif
@@ -1165,7 +1198,7 @@ endif 
endif # PRODUCT_USE_LOGICAL_PARTITIONS



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

# $(2): a subset of "system vendor cache userdata product product_services oem"

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

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

define generate-image-prop-dictionary

$(if $(filter $(2),system),\
@@ -1228,6 +1261,19 @@ $(if $(filter $(2),product_services),\ 
    $(if $(BOARD_PRODUCT_SERVICESIMAGE_SQUASHFS_DISABLE_4K_ALIGN),$(hide) echo "product_services_squashfs_disable_4k_align=$(BOARD_PRODUCT_SERVICESIMAGE_SQUASHFS_DISABLE_4K_ALIGN)" >> $(1))

    $(if $(BOARD_PRODUCT_SERVICESIMAGE_PARTITION_RESERVED_SIZE),$(hide) echo "product_services_reserved_size=$(BOARD_PRODUCT_SERVICESIMAGE_PARTITION_RESERVED_SIZE)" >> $(1))

)

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

    $(if $(BOARD_ODMIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "odm_fs_type=$(BOARD_ODMIMAGE_FILE_SYSTEM_TYPE)" >> $(1))

    $(if $(BOARD_ODMIMAGE_EXTFS_INODE_COUNT),$(hide) echo "odm_extfs_inode_count=$(BOARD_ODMIMAGE_EXTFS_INODE_COUNT)" >> $(1))

    $(if $(BOARD_ODMIMAGE_EXTFS_RSV_PCT),$(hide) echo "odm_extfs_rsv_pct=$(BOARD_ODMIMAGE_EXTFS_RSV_PCT)" >> $(1))

    $(if $(BOARD_ODMIMAGE_PARTITION_SIZE),$(hide) echo "odm_size=$(BOARD_ODMIMAGE_PARTITION_SIZE)" >> $(1))

    $(if $(BOARD_ODMIMAGE_JOURNAL_SIZE),$(hide) echo "odm_journal_size=$(BOARD_ODMIMAGE_JOURNAL_SIZE)" >> $(1))

    $(if $(BOARD_ODMIMAGE_SQUASHFS_COMPRESSOR),$(hide) echo "odm_squashfs_compressor=$(BOARD_ODMIMAGE_SQUASHFS_COMPRESSOR)" >> $(1))

    $(if $(BOARD_ODMIMAGE_SQUASHFS_COMPRESSOR_OPT),$(hide) echo "odm_squashfs_compressor_opt=$(BOARD_ODMIMAGE_SQUASHFS_COMPRESSOR_OPT)" >> $(1))

    $(if $(BOARD_ODMIMAGE_SQUASHFS_BLOCK_SIZE),$(hide) echo "odm_squashfs_block_size=$(BOARD_ODMIMAGE_SQUASHFS_BLOCK_SIZE)" >> $(1))

    $(if $(BOARD_ODMIMAGE_SQUASHFS_DISABLE_4K_ALIGN),$(hide) echo "odm_squashfs_disable_4k_align=$(BOARD_ODMIMAGE_SQUASHFS_DISABLE_4K_ALIGN)" >> $(1))

    $(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ODM_BASE_FS_PATH),$(hide) echo "odm_base_fs_file=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ODM_BASE_FS_PATH)" >> $(1))

    $(if $(BOARD_ODMIMAGE_PARTITION_RESERVED_SIZE),$(hide) echo "odm_reserved_size=$(BOARD_ODMIMAGE_PARTITION_RESERVED_SIZE)" >> $(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))
@@ -1235,6 +1281,7 @@ $(if $(filter $(2),oem),\ 
    $(if $(BOARD_OEMIMAGE_EXTFS_RSV_PCT),$(hide) echo "oem_extfs_rsv_pct=$(BOARD_OEMIMAGE_EXTFS_RSV_PCT)" >> $(1))

)

$(hide) echo "ext_mkuserimg=$(notdir $(MKEXTUSERIMG))" >> $(1)



$(if $(INTERNAL_USERIMAGES_EXT_VARIANT),$(hide) echo "fs_type=$(INTERNAL_USERIMAGES_EXT_VARIANT)" >> $(1))

$(if $(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG),$(hide) echo "extfs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG)" >> $(1))

$(if $(INTERNAL_USERIMAGES_SPARSE_SQUASHFS_FLAG),$(hide) echo "squashfs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_SQUASHFS_FLAG)" >> $(1))
@@ -1287,6 +1334,13 @@ $(if $(BOARD_AVB_ENABLE),\ 
        $(hide) echo "avb_product_services_key_path=$(BOARD_AVB_PRODUCT_SERVICES_KEY_PATH)" >> $(1)

        $(hide) echo "avb_product_services_algorithm=$(BOARD_AVB_PRODUCT_SERVICES_ALGORITHM)" >> $(1)

        $(hide) echo "avb_product_services_rollback_index_location=$(BOARD_AVB_PRODUCT_SERVICES_ROLLBACK_INDEX_LOCATION)" >> $(1)))

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

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

$(if $(BOARD_AVB_ENABLE),\

    $(if $(BOARD_AVB_ODM_KEY_PATH),\

        $(hide) echo "avb_odm_key_path=$(BOARD_AVB_ODM_KEY_PATH)" >> $(1)

        $(hide) echo "avb_odm_algorithm=$(BOARD_AVB_ODM_ALGORITHM)" >> $(1)

        $(hide) echo "avb_odm_rollback_index_location=$(BOARD_AVB_ODM_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)),\
@@ -1299,7 +1353,7 @@ endef 
# $(1): the path of the output dictionary file

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

define generate-userimage-prop-dictionary

$(call generate-image-prop-dictionary,$(1),system vendor cache userdata product product_services oem,$(2))

$(call generate-image-prop-dictionary,$(1),system vendor cache userdata product product_services oem odm,$(2))

endef



# $(1): the path of the input dictionary file, where each line has the format key=value
@@ -1484,6 +1538,7 @@ $(INSTALLED_RECOVERY_BUILD_PROP_TARGET): \ 
		$(INSTALLED_VENDOR_DEFAULT_PROP_TARGET) \

		$(intermediate_system_build_prop) \

		$(INSTALLED_VENDOR_BUILD_PROP_TARGET) \

		$(INSTALLED_ODM_BUILD_PROP_TARGET) \

		$(INSTALLED_PRODUCT_BUILD_PROP_TARGET) \

		$(INSTALLED_PRODUCT_SERVICES_BUILD_PROP_TARGET)

	@echo "Target recovery buildinfo: $@
@@ -1493,6 +1548,7 @@ $(INSTALLED_RECOVERY_BUILD_PROP_TARGET): \ 
	$(hide) cat $(INSTALLED_VENDOR_DEFAULT_PROP_TARGET) >> $@

	$(hide) cat $(intermediate_system_build_prop) >> $@

	$(hide) cat $(INSTALLED_VENDOR_BUILD_PROP_TARGET) >> $@

	$(hide) cat $(INSTALLED_ODM_BUILD_PROP_TARGET) >> $@

	$(hide) cat $(INSTALLED_PRODUCT_BUILD_PROP_TARGET) >> $@

	$(hide) cat $(INSTALLED_PRODUCT_SERVICES_BUILD_PROP_TARGET) >> $@

	$(call append-recovery-ui-properties,$(PRIVATE_RECOVERY_UI_PROPERTIES),$@)
@@ -1771,6 +1827,21 @@ define create-system-product-services-symlink 
endef

endif



# Create symlink /vendor/odm to /odm if necessary.

ifdef BOARD_USES_ODMIMAGE

define create-vendor-odm-symlink

$(hide) if [ -d $(TARGET_OUT_VENDOR)/odm ] && [ ! -h $(TARGET_OUT_VENDOR)/odm ]; then \

  echo 'Non-symlink $(TARGET_OUT_VENDOR)/odm detected!' 1>&2; \

  echo 'You cannot install files to $(TARGET_OUT_VENDOR)/odm while building a separate odm.img!' 1>&2; \

  exit 1; \

fi

$(hide) ln -sf /odm $(TARGET_OUT_VENDOR)/odm

endef

else

define create-vendor-odm-symlink

endef

endif



# $(1): output file

define build-systemimage-target

  @echo "Target system fs image: $(1)"
@@ -1946,6 +2017,10 @@ ifdef BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE 
	$(hide) cd $(dir $@) && zip -qryX $(notdir $@) \

		$(TARGET_COPY_OUT_PRODUCT_SERVICES)

endif

ifdef BOARD_ODMIMAGE_FILE_SYSTEM_TYPE

	$(hide) cd $(dir $@) && zip -qryX $(notdir $@) \

		$(TARGET_COPY_OUT_ODM)

endif

ifneq ($(PDK_PLATFORM_JAVA_ZIP_CONTENTS),)

	$(hide) cd $(OUT_DIR) && zip -qryX $(patsubst $(OUT_DIR)/%,%,$@) $(PDK_PLATFORM_JAVA_ZIP_CONTENTS)

endif
@@ -2263,6 +2338,7 @@ BUILT_VENDORIMAGE_TARGET := $(PRODUCT_OUT)/vendor.img 
define build-vendorimage-target

  $(call pretty,"Target vendor fs image: $(INSTALLED_VENDORIMAGE_TARGET)")

  @mkdir -p $(TARGET_OUT_VENDOR)

  $(call create-vendor-odm-symlink)

  @mkdir -p $(vendorimage_intermediates) && rm -rf $(vendorimage_intermediates)/vendor_image_info.txt

  $(call generate-image-prop-dictionary, $(vendorimage_intermediates)/vendor_image_info.txt,vendor,skip_fsck=true)

  $(if $(BOARD_VENDOR_KERNEL_MODULES), \
@@ -2405,6 +2481,62 @@ INSTALLED_PRODUCT_SERVICESIMAGE_TARGET := $(PRODUCT_OUT)/product-services.img 
$(eval $(call copy-one-file,$(BOARD_PREBUILT_PRODUCT_SERVICESIMAGE),$(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET)))

endif



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

# odm partition image

ifdef BOARD_ODMIMAGE_FILE_SYSTEM_TYPE

INTERNAL_ODMIMAGE_FILES := \

    $(filter $(TARGET_OUT_ODM)/%,\

      $(ALL_DEFAULT_INSTALLED_MODULES)\

      $(ALL_PDK_FUSION_FILES)) \

    $(PDK_FUSION_SYMLINK_STAMP)

# platform.zip depends on $(INTERNAL_ODMIMAGE_FILES).

$(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_ODMIMAGE_FILES)



INSTALLED_FILES_FILE_ODM := $(PRODUCT_OUT)/installed-files-odm.txt

INSTALLED_FILES_JSON_ODM := $(INSTALLED_FILES_FILE_ODM:.txt=.json)

$(INSTALLED_FILES_FILE_ODM): .KATI_IMPLICIT_OUTPUTS := $(INSTALLED_FILES_JSON_ODM)

$(INSTALLED_FILES_FILE_ODM) : $(INTERNAL_ODMIMAGE_FILES) $(FILESLIST)

	@echo Installed file list: $@

	@mkdir -p $(dir $@)

	@rm -f $@

	$(hide) $(FILESLIST) $(TARGET_OUT_ODM) > $(@:.txt=.json)

	$(hide) build/tools/fileslist_util.py -c $(@:.txt=.json) > $@



odmimage_intermediates := \

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

BUILT_ODMIMAGE_TARGET := $(PRODUCT_OUT)/odm.img

define build-odmimage-target

  $(call pretty,"Target odm fs image: $(INSTALLED_ODMIMAGE_TARGET)")

  @mkdir -p $(TARGET_OUT_ODM)

  @mkdir -p $(odmimage_intermediates) && rm -rf $(odmimage_intermediates)/odm_image_info.txt

  $(call generate-userimage-prop-dictionary, $(odmimage_intermediates)/odm_image_info.txt, skip_fsck=true)

  $(if $(BOARD_ODM_KERNEL_MODULES), \

    $(call build-image-kernel-modules,$(BOARD_ODM_KERNEL_MODULES),$(TARGET_OUT_ODM),odm/,$(call intermediates-dir-for,PACKAGING,depmod_odm)))

  $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \

      ./build/tools/releasetools/build_image.py \

      $(TARGET_OUT_ODM) $(odmimage_intermediates)/odm_image_info.txt $(INSTALLED_ODMIMAGE_TARGET) $(TARGET_OUT) \

	  $(odmimage_intermediates)/generated_odm_image_info.txt

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

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

          $(odmimage_intermediates)/generated_odm_image_info.txt,odm_size))

endef



# We just build this directly to the install location.

INSTALLED_ODMIMAGE_TARGET := $(BUILT_ODMIMAGE_TARGET)

$(INSTALLED_ODMIMAGE_TARGET): $(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_ODMIMAGE_FILES) $(INSTALLED_FILES_FILE_ODM) $(BUILD_IMAGE_SRCS) $(DEPMOD) $(BOARD_ODM_KERNEL_MODULES)

	$(build-odmimage-target)



.PHONY: odmimage-nodeps onod

odmimage-nodeps onod: | $(INTERNAL_USERIMAGES_DEPS) $(DEPMOD)

	$(build-odmimage-target)



sync: $(INTERNAL_ODMIMAGE_FILES)



else ifdef BOARD_PREBUILT_ODMIMAGE

INSTALLED_ODMIMAGE_TARGET := $(PRODUCT_OUT)/odm.img

$(eval $(call copy-one-file,$(BOARD_PREBUILT_ODMIMAGE),$(INSTALLED_ODMIMAGE_TARGET)))

endif



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

# dtbo image

ifdef BOARD_PREBUILT_DTBOIMAGE
@@ -2450,6 +2582,7 @@ VENDOR_FOOTER_ARGS := BOARD_AVB_VENDOR_ADD_HASHTREE_FOOTER_ARGS 
RECOVERY_FOOTER_ARGS := BOARD_AVB_RECOVERY_ADD_HASH_FOOTER_ARGS

PRODUCT_FOOTER_ARGS := BOARD_AVB_PRODUCT_ADD_HASHTREE_FOOTER_ARGS

PRODUCT_SERVICES_FOOTER_ARGS := BOARD_AVB_PRODUCT_SERVICES_ADD_HASHTREE_FOOTER_ARGS

ODM_FOOTER_ARGS := BOARD_AVB_ODM_ADD_HASHTREE_FOOTER_ARGS



# Check and set required build variables for a chain partition.

# $(1): the partition to enable AVB chain, e.g., BOOT or SYSTEM.
@@ -2513,6 +2646,15 @@ INTERNAL_AVB_MAKE_VBMETA_IMAGE_ARGS += \ 
endif

endif



ifdef INSTALLED_ODMIMAGE_TARGET

ifdef BOARD_AVB_ODM_KEY_PATH

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

else

INTERNAL_AVB_MAKE_VBMETA_IMAGE_ARGS += \

    --include_descriptors_from_image $(INSTALLED_ODMIMAGE_TARGET)

endif

endif



ifdef INSTALLED_DTBOIMAGE_TARGET

ifdef BOARD_AVB_DTBO_KEY_PATH

$(eval $(call check-and-set-avb-chain-args,DTBO))
@@ -2572,6 +2714,9 @@ define extract-avb-chain-public-keys 
  $(if $(BOARD_AVB_PRODUCT_SERVICES_KEY_PATH),\

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

      --output $(1)/product-services.avbpubkey)

  $(if $(BOARD_AVB_ODM_KEY_PATH),\

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

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

  $(if $(BOARD_AVB_DTBO_KEY_PATH),\

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

      --output $(1)/dtbo.avbpubkey)
@@ -2600,6 +2745,7 @@ $(INSTALLED_VBMETAIMAGE_TARGET): \ 
		$(INSTALLED_VENDORIMAGE_TARGET) \

		$(INSTALLED_PRODUCTIMAGE_TARGET) \

		$(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET) \

		$(INSTALLED_ODMIMAGE_TARGET) \

		$(INSTALLED_DTBOIMAGE_TARGET) \

		$(INSTALLED_RECOVERYIMAGE_TARGET) \

		$(BOARD_AVB_KEY_PATH)
@@ -2955,6 +3101,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \ 
		$(INSTALLED_PRODUCTIMAGE_TARGET) \

		$(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET) \

		$(INSTALLED_VBMETAIMAGE_TARGET) \

		$(INSTALLED_ODMIMAGE_TARGET) \

		$(INSTALLED_DTBOIMAGE_TARGET) \

		$(INTERNAL_SYSTEMOTHERIMAGE_FILES) \

		$(INSTALLED_ANDROID_INFO_TXT_TARGET) \
@@ -2964,6 +3111,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \ 
		$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VENDOR_BASE_FS_PATH) \

		$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PRODUCT_BASE_FS_PATH) \

		$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PRODUCT_SERVICES_BASE_FS_PATH) \

		$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ODM_BASE_FS_PATH) \

		$(SELINUX_FC) \

		$(APKCERTS_FILE) \

		$(SOONG_ZIP) \
@@ -2980,6 +3128,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \ 
	$(call create-system-vendor-symlink)

	$(call create-system-product-symlink)

	$(call create-system-product-services-symlink)

	$(call create-vendor-odm-symlink)

	$(hide) rm -rf $@ $@.list $(zip_root)

	$(hide) mkdir -p $(dir $@) $(zip_root)

ifneq (,$(INSTALLED_RECOVERYIMAGE_TARGET)$(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)))
@@ -3058,6 +3207,11 @@ ifdef BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE 
	$(hide) $(call package_files-copy-root, \

		$(TARGET_OUT_PRODUCT_SERVICES),$(zip_root)/PRODUCT-SERVICES)

endif

ifdef BOARD_ODMIMAGE_FILE_SYSTEM_TYPE

	@# Contents of the odm image

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

		$(TARGET_OUT_ODM),$(zip_root)/ODM)

endif

ifdef INSTALLED_SYSTEMOTHERIMAGE_TARGET

	@# Contents of the system_other image

	$(hide) $(call package_files-copy-root, \
@@ -3133,6 +3287,10 @@ ifneq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PRODUCT_SERVICES_BASE_FS_PATH),) 
	$(hide) cp $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PRODUCT_SERVICES_BASE_FS_PATH) \

	  $(zip_root)/META/$(notdir $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PRODUCT_SERVICES_BASE_FS_PATH))

endif

ifneq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ODM_BASE_FS_PATH),)

	$(hide) cp $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ODM_BASE_FS_PATH) \

	  $(zip_root)/META/$(notdir $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ODM_BASE_FS_PATH))

endif

ifneq ($(strip $(SANITIZE_TARGET)),)

	# We need to create userdata.img with real data because the instrumented libraries are in userdata.img.

	$(hide) echo "userdata_img_with_data=true" >> $(zip_root)/META/misc_info.txt
@@ -3217,6 +3375,10 @@ ifdef BOARD_PREBUILT_BOOTIMAGE 
	$(hide) mkdir -p $(zip_root)/IMAGES

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

endif

ifdef BOARD_PREBUILT_ODMIMAGE

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

	$(hide) cp $(INSTALLED_ODMIMAGE_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/
@@ -3249,6 +3411,9 @@ endif 
ifdef BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE

	$(hide) $(call fs_config,$(zip_root)/PRODUCT_SERVICES,product-services/) > $(zip_root)/META/product_services_filesystem_config.txt

endif

ifdef BOARD_ODMIMAGE_FILE_SYSTEM_TYPE

	$(hide) $(call fs_config,$(zip_root)/ODM,odm/) > $(zip_root)/META/odm_filesystem_config.txt

endif

ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)

	@# When using BOARD_BUILD_SYSTEM_ROOT_IMAGE, ROOT always contains the files for the root under

	@# normal boot. BOOT/RAMDISK exists only if additionally using BOARD_USES_RECOVERY_AS_BOOT.
@@ -3397,6 +3562,7 @@ $(SYMBOLS_ZIP): $(INSTALLED_SYSTEMIMAGE) \ 
		$(INSTALLED_VENDORIMAGE_TARGET) \

		$(INSTALLED_PRODUCTIMAGE_TARGET) \

		$(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET) \

		$(INSTALLED_ODMIMAGE_TARGET) \

		$(updater_dep)

endif

$(SYMBOLS_ZIP): PRIVATE_LIST_FILE := $(call intermediates-dir-for,PACKAGING,symbols)/filelist
@@ -3422,7 +3588,8 @@ $(COVERAGE_ZIP): $(INSTALLED_SYSTEMIMAGE) \ 
		$(INSTALLED_USERDATAIMAGE_TARGET) \

		$(INSTALLED_VENDORIMAGE_TARGET) \

		$(INSTALLED_PRODUCTIMAGE_TARGET) \

		$(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET)

		$(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET) \

		$(INSTALLED_ODMIMAGE_TARGET)

endif

$(COVERAGE_ZIP): PRIVATE_LIST_FILE := $(call intermediates-dir-for,PACKAGING,coverage)/filelist

$(COVERAGE_ZIP): $(SOONG_ZIP)
@@ -3540,6 +3707,15 @@ $(INSTALLED_QEMU_PRODUCT_SERVICESIMAGE): $(INSTALLED_PRODUCT_SERVICESIMAGE_TARGE 
productservicesimage: $(INSTALLED_QEMU_PRODUCT_SERVICESIMAGE)

droidcore: $(INSTALLED_QEMU_PRODUCT_SERVICESIMAGE)

endif

ifeq ($(BOARD_USES_ODMIMAGE),true)

INSTALLED_QEMU_ODMIMAGE := $(PRODUCT_OUT)/odm-qemu.img

$(INSTALLED_QEMU_ODMIMAGE): $(INSTALLED_ODMIMAGE_TARGET) $(MK_QEMU_IMAGE_SH) $(SGDISK_HOST)

	@echo Create odm-qemu.img

	(export SGDISK=$(SGDISK_HOST); $(MK_QEMU_IMAGE_SH) ${PRODUCT_OUT}/odm.img)



odmimage: $(INSTALLED_QEMU_ODMIMAGE)

droidcore: $(INSTALLED_QEMU_ODMIMAGE)

endif

endif

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

# The emulator package

core/config.mk

+8 −0
Original line number Diff line number Diff line
@@ -964,6 +964,13 @@ $(error Should not define BOARD_VENDORIMAGE_PARTITION_SIZE and \ 
endif

endif



ifneq ($(BOARD_ODMIMAGE_PARTITION_SIZE),)

ifneq ($(BOARD_ODMIMAGE_PARTITION_RESERVED_SIZE),)

$(error Should not define BOARD_ODMIMAGE_PARTITION_SIZE and \

    BOARD_ODMIMAGE_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 \
@@ -1163,6 +1170,7 @@ dont_bother_goals := out \ 
    vnod vendorimage-nodeps \

    pnod productimage-nodeps \

    psnod productservicesimage-nodeps \

    onod odmimage-nodeps \

    systemotherimage-nodeps \

    ramdisk-nodeps \

    bootimage-nodeps \

core/envsetup.mk

+65 −6
Original line number Diff line number Diff line
@@ -222,6 +222,17 @@ _product_services_path_placeholder := ||PRODUCT-SERVICES-PATH-PH|| 
TARGET_COPY_OUT_PRODUCT_SERVICES := $(_product_services_path_placeholder)

###########################################



###########################################

# Define TARGET_COPY_OUT_ODM to a placeholder, for at this point

# we don't know if the device wants to build a separate odm.img

# or just build odm stuff into vendor.img.

# A device can set up TARGET_COPY_OUT_ODM to "odm" in its

# BoardConfig.mk.

# We'll substitute with the real value after loading BoardConfig.mk.

_odm_path_placeholder := ||ODM-PATH-PH||

TARGET_COPY_OUT_ODM := $(_odm_path_placeholder)

###########################################



#################################################################

# Set up minimal BOOTCLASSPATH list of jars to build/execute

# java code with dalvikvm/art.
@@ -374,6 +385,28 @@ else ifdef BOARD_USES_PRODUCT_SERVICESIMAGE 
$(error TARGET_COPY_OUT_PRODUCT_SERVICES must be set to 'product-services' to use a product-services image)

endif



###########################################

# Now we can substitute with the real value of TARGET_COPY_OUT_ODM

ifeq ($(TARGET_COPY_OUT_ODM),$(_odm_path_placeholder))

TARGET_COPY_OUT_ODM := vendor/odm

else ifeq ($(filter odm vendor/odm,$(TARGET_COPY_OUT_ODM)),)

$(error TARGET_COPY_OUT_ODM must be either 'odm' or 'vendor/odm', seeing '$(TARGET_COPY_OUT_ODM)'.)

endif

PRODUCT_COPY_FILES := $(subst $(_odm_path_placeholder),$(TARGET_COPY_OUT_ODM),$(PRODUCT_COPY_FILES))



BOARD_USES_ODMIMAGE :=

ifdef BOARD_PREBUILT_ODMIMAGE

BOARD_USES_ODMIMAGE := true

endif

ifdef BOARD_ODMIMAGE_FILE_SYSTEM_TYPE

BOARD_USES_ODMIMAGE := true

endif

ifeq ($(TARGET_COPY_OUT_ODM),odm)

BOARD_USES_ODMIMAGE := true

else ifdef BOARD_USES_ODMIMAGE

$(error TARGET_COPY_OUT_ODM must be set to 'odm' to use an odm image)

endif



###########################################

# Ensure that only TARGET_RECOVERY_UPDATER_LIBS *or* AB_OTA_UPDATER is set.

TARGET_RECOVERY_UPDATER_LIBS ?=
@@ -838,32 +871,58 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_OEM_APPS := $(TARGET_OUT_OEM_APPS) 
  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_OEM_APPS \



TARGET_OUT_ODM := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_ODM)

ifneq ($(filter address,$(SANITIZE_TARGET)),)

target_out_odm_shared_libraries_base := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_ASAN)/odm

ifeq ($(SANITIZE_LITE),true)

# When using SANITIZE_LITE, APKs must not be packaged with sanitized libraries, as they will not

# work with unsanitized app_process. For simplicity, generate APKs into /data/asan/.

target_out_odm_app_base := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_ASAN)/odm

else

target_out_odm_app_base := $(TARGET_OUT_ODM)

endif

else

target_out_odm_shared_libraries_base := $(TARGET_OUT_ODM)

target_out_odm_app_base := $(TARGET_OUT_ODM)

endif



TARGET_OUT_ODM_EXECUTABLES := $(TARGET_OUT_ODM)/bin

TARGET_OUT_ODM_OPTIONAL_EXECUTABLES := $(TARGET_OUT_ODM)/xbin

ifeq ($(TARGET_IS_64_BIT),true)

TARGET_OUT_ODM_SHARED_LIBRARIES := $(TARGET_OUT_ODM)/lib64

TARGET_OUT_ODM_SHARED_LIBRARIES := $(target_out_odm_shared_libraries_base)/lib64

else

TARGET_OUT_ODM_SHARED_LIBRARIES := $(TARGET_OUT_ODM)/lib

TARGET_OUT_ODM_SHARED_LIBRARIES := $(target_out_odm_shared_libraries_base)/lib

endif

TARGET_OUT_ODM_APPS := $(TARGET_OUT_ODM)/app

TARGET_OUT_ODM_RENDERSCRIPT_BITCODE := $(TARGET_OUT_ODM_SHARED_LIBRARIES)

TARGET_OUT_ODM_JAVA_LIBRARIES := $(TARGET_OUT_ODM)/framework

TARGET_OUT_ODM_APPS := $(target_out_odm_app_base)/app

TARGET_OUT_ODM_APPS_PRIVILEGED := $(target_out_odm_app_base)/priv-app

TARGET_OUT_ODM_ETC := $(TARGET_OUT_ODM)/etc

.KATI_READONLY := \

  TARGET_OUT_ODM \

  TARGET_OUT_ODM_EXECUTABLES \

  TARGET_OUT_ODM_OPTIONAL_EXECUTABLES \

  TARGET_OUT_ODM_SHARED_LIBRARIES \

  TARGET_OUT_ODM_RENDERSCRIPT_BITCODE \

  TARGET_OUT_ODM_JAVA_LIBRARIES \

  TARGET_OUT_ODM_APPS \

  TARGET_OUT_ODM_APPS_PRIVILEGED \

  TARGET_OUT_ODM_ETC



$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_EXECUTABLES := $(TARGET_OUT_ODM_EXECUTABLES)

ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_SHARED_LIBRARIES := $(TARGET_OUT_ODM)/lib/$(TARGET_2ND_ARCH)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_SHARED_LIBRARIES := $(target_out_odm_shared_libraries_base)/lib/$(TARGET_2ND_ARCH)

else

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_SHARED_LIBRARIES := $(TARGET_OUT_ODM)/lib

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_SHARED_LIBRARIES := $(target_out_odm_shared_libraries_base)/lib

endif

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_RENDERSCRIPT_BITCODE := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_SHARED_LIBRARIES)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_APPS := $(TARGET_OUT_ODM_APPS)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_APPS_PRIVILEGED := $(TARGET_OUT_ODM_APPS_PRIVILEGED)

.KATI_READONLY := \

  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_EXECUTABLES \

  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_SHARED_LIBRARIES \

  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_APPS

  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_RENDERSCRIPT_BITCODE \

  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_APPS \

  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_APPS_PRIVILEGED



TARGET_OUT_PRODUCT := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_PRODUCT)

TARGET_OUT_PRODUCT_EXECUTABLES := $(TARGET_OUT_PRODUCT)/bin

core/local_vndk.mk

+1 −1
Original line number Diff line number Diff line 


#Set LOCAL_USE_VNDK for modules going into vendor partition, except for host modules

#Set LOCAL_USE_VNDK for modules going into vendor or odm partition, except for host modules

#If LOCAL_SDK_VERSION is set, thats a more restrictive set, so they dont need LOCAL_USE_VNDK

ifndef LOCAL_IS_HOST_MODULE

ifndef LOCAL_SDK_VERSION

core/main.mk

+8 −0

File changed.

Preview size limit exceeded, changes collapsed.