diff --git a/core/Makefile b/core/Makefile index 9c26b8ba55..f4bd2132f5 100644 --- a/core/Makefile +++ b/core/Makefile @@ -480,9 +480,9 @@ $(INSTALLED_PRODUCT_SERVICES_BUILD_PROP_TARGET): @mkdir -p $(dir $@) $(hide) echo > $@ ifdef BOARD_USES_PRODUCT_SERVICESIMAGE - $(hide) echo ro.productservices.build.date=`$(DATE_FROM_FILE)`>>$@ - $(hide) echo ro.productservices.build.date.utc=`$(DATE_FROM_FILE) +%s`>>$@ - $(hide) echo ro.productservices.build.fingerprint="$(BUILD_FINGERPRINT_FROM_FILE)">>$@ + $(hide) echo ro.product_services.build.date=`$(DATE_FROM_FILE)`>>$@ + $(hide) echo ro.product_services.build.date.utc=`$(DATE_FROM_FILE) +%s`>>$@ + $(hide) echo ro.product_services.build.fingerprint="$(BUILD_FINGERPRINT_FROM_FILE)">>$@ endif # BOARD_USES_PRODUCT_SERVICESIMAGE $(hide) echo "#" >> $@; \ echo "# ADDITIONAL PRODUCT_SERVICES PROPERTIES" >> $@; \ @@ -1162,7 +1162,7 @@ endif endif # USE_LOGICAL_PARTITIONS # $(1): the path of the output dictionary file -# $(2): a subset of "system vendor cache userdata product productservices oem" +# $(2): a subset of "system vendor cache userdata product product_services oem" # $(3): additional "key=value" pairs to append to the dictionary file. define generate-image-prop-dictionary $(if $(filter $(2),system),\ @@ -1213,17 +1213,17 @@ $(if $(filter $(2),product),\ $(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PRODUCT_BASE_FS_PATH),$(hide) echo "product_base_fs_file=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PRODUCT_BASE_FS_PATH)" >> $(1)) $(if $(BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE),$(hide) echo "product_reserved_size=$(BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE)" >> $(1)) ) -$(if $(filter $(2),productservices),\ - $(if $(BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "productservices_fs_type=$(BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE)" >> $(1)) - $(if $(BOARD_PRODUCT_SERVICESIMAGE_EXTFS_INODE_COUNT),$(hide) echo "productservices_extfs_inode_count=$(BOARD_PRODUCT_SERVICESIMAGE_EXTFS_INODE_COUNT)" >> $(1)) - $(if $(BOARD_PRODUCT_SERVICESIMAGE_EXTFS_RSV_PCT),$(hide) echo "productservices_extfs_rsv_pct=$(BOARD_PRODUCT_SERVICESIMAGE_EXTFS_RSV_PCT)" >> $(1)) - $(if $(BOARD_PRODUCT_SERVICESIMAGE_PARTITION_SIZE),$(hide) echo "productservices_size=$(BOARD_PRODUCT_SERVICESIMAGE_PARTITION_SIZE)" >> $(1)) - $(if $(BOARD_PRODUCT_SERVICESIMAGE_JOURNAL_SIZE),$(hide) echo "productservices_journal_size=$(BOARD_PRODUCT_SERVICESIMAGE_JOURNAL_SIZE)" >> $(1)) - $(if $(BOARD_PRODUCT_SERVICESIMAGE_SQUASHFS_COMPRESSOR),$(hide) echo "productservices_squashfs_compressor=$(BOARD_PRODUCT_SERVICESIMAGE_SQUASHFS_COMPRESSOR)" >> $(1)) - $(if $(BOARD_PRODUCT_SERVICESIMAGE_SQUASHFS_COMPRESSOR_OPT),$(hide) echo "productservices_squashfs_compressor_opt=$(BOARD_PRODUCT_SERVICESIMAGE_SQUASHFS_COMPRESSOR_OPT)" >> $(1)) - $(if $(BOARD_PRODUCT_SERVICESIMAGE_SQUASHFS_BLOCK_SIZE),$(hide) echo "productservices_squashfs_block_size=$(BOARD_PRODUCT_SERVICESIMAGE_SQUASHFS_BLOCK_SIZE)" >> $(1)) - $(if $(BOARD_PRODUCT_SERVICESIMAGE_SQUASHFS_DISABLE_4K_ALIGN),$(hide) echo "productservices_squashfs_disable_4k_align=$(BOARD_PRODUCT_SERVICESIMAGE_SQUASHFS_DISABLE_4K_ALIGN)" >> $(1)) - $(if $(BOARD_PRODUCT_SERVICESIMAGE_PARTITION_RESERVED_SIZE),$(hide) echo "productservices_reserved_size=$(BOARD_PRODUCT_SERVICESIMAGE_PARTITION_RESERVED_SIZE)" >> $(1)) +$(if $(filter $(2),product_services),\ + $(if $(BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "product_services_fs_type=$(BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE)" >> $(1)) + $(if $(BOARD_PRODUCT_SERVICESIMAGE_EXTFS_INODE_COUNT),$(hide) echo "product_services_extfs_inode_count=$(BOARD_PRODUCT_SERVICESIMAGE_EXTFS_INODE_COUNT)" >> $(1)) + $(if $(BOARD_PRODUCT_SERVICESIMAGE_EXTFS_RSV_PCT),$(hide) echo "product_services_extfs_rsv_pct=$(BOARD_PRODUCT_SERVICESIMAGE_EXTFS_RSV_PCT)" >> $(1)) + $(if $(BOARD_PRODUCT_SERVICESIMAGE_PARTITION_SIZE),$(hide) echo "product_services_size=$(BOARD_PRODUCT_SERVICESIMAGE_PARTITION_SIZE)" >> $(1)) + $(if $(BOARD_PRODUCT_SERVICESIMAGE_JOURNAL_SIZE),$(hide) echo "product_services_journal_size=$(BOARD_PRODUCT_SERVICESIMAGE_JOURNAL_SIZE)" >> $(1)) + $(if $(BOARD_PRODUCT_SERVICESIMAGE_SQUASHFS_COMPRESSOR),$(hide) echo "product_services_squashfs_compressor=$(BOARD_PRODUCT_SERVICESIMAGE_SQUASHFS_COMPRESSOR)" >> $(1)) + $(if $(BOARD_PRODUCT_SERVICESIMAGE_SQUASHFS_COMPRESSOR_OPT),$(hide) echo "product_services_squashfs_compressor_opt=$(BOARD_PRODUCT_SERVICESIMAGE_SQUASHFS_COMPRESSOR_OPT)" >> $(1)) + $(if $(BOARD_PRODUCT_SERVICESIMAGE_SQUASHFS_BLOCK_SIZE),$(hide) echo "product_services_squashfs_block_size=$(BOARD_PRODUCT_SERVICESIMAGE_SQUASHFS_BLOCK_SIZE)" >> $(1)) + $(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),oem),\ $(if $(BOARD_OEMIMAGE_PARTITION_SIZE),$(hide) echo "oem_size=$(BOARD_OEMIMAGE_PARTITION_SIZE)" >> $(1)) @@ -1248,7 +1248,7 @@ $(if $(filter eng, $(TARGET_BUILD_VARIANT)),$(hide) echo "verity_disable=true" > $(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_VERITY_PARTITION),$(hide) echo "system_verity_block_device=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_VERITY_PARTITION)" >> $(1)) $(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VENDOR_VERITY_PARTITION),$(hide) echo "vendor_verity_block_device=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VENDOR_VERITY_PARTITION)" >> $(1)) $(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PRODUCT_VERITY_PARTITION),$(hide) echo "product_verity_block_device=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PRODUCT_VERITY_PARTITION)" >> $(1)) -$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PRODUCT_SERVICES_VERITY_PARTITION),$(hide) echo "productservices_verity_block_device=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PRODUCT_SERVICES_VERITY_PARTITION)" >> $(1)) +$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PRODUCT_SERVICES_VERITY_PARTITION),$(hide) echo "product_services_verity_block_device=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PRODUCT_SERVICES_VERITY_PARTITION)" >> $(1)) $(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT),$(hide) echo "vboot=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT)" >> $(1)) $(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT),$(hide) echo "vboot_key=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VBOOT_SIGNING_KEY)" >> $(1)) $(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT),$(hide) echo "vboot_subkey=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VBOOT_SIGNING_SUBKEY)" >> $(1)) @@ -1278,9 +1278,9 @@ $(if $(BOARD_AVB_ENABLE),\ $(hide) echo "avb_product_rollback_index_location=$(BOARD_AVB_PRODUCT_ROLLBACK_INDEX_LOCATION)" >> $(1))) $(if $(BOARD_AVB_ENABLE),\ $(if $(BOARD_AVB_PRODUCT_SERVICES_KEY_PATH),\ - $(hide) echo "avb_productservices_key_path=$(BOARD_AVB_PRODUCT_SERVICES_KEY_PATH)" >> $(1) - $(hide) echo "avb_productservices_algorithm=$(BOARD_AVB_PRODUCT_SERVICES_ALGORITHM)" >> $(1) - $(hide) echo "avb_productservices_rollback_index_location=$(BOARD_AVB_PRODUCT_SERVICES_ROLLBACK_INDEX_LOCATION)" >> $(1))) + $(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 $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)),\ $(hide) echo "recovery_as_boot=true" >> $(1)) $(if $(filter true,$(BOARD_BUILD_SYSTEM_ROOT_IMAGE)),\ @@ -1293,7 +1293,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 productservices oem,$(2)) +$(call generate-image-prop-dictionary,$(1),system vendor cache userdata product product_services oem,$(2)) endef # $(1): the path of the input dictionary file, where each line has the format key=value @@ -1698,7 +1698,7 @@ endif # Create symlink /system/product-services to /product-services if necessary. ifdef BOARD_USES_PRODUCT_SERVICESIMAGE -define create-system-productservices-symlink +define create-system-product-services-symlink $(hide) if [ -d $(TARGET_OUT)/product-services ] && [ ! -h $(TARGET_OUT)/product-services ]; then \ echo 'Non-symlink $(TARGET_OUT)/product-services detected!' 1>&2; \ echo 'You cannot install files to $(TARGET_OUT)/product-services while building a separate product-services.img!' 1>&2; \ @@ -1707,7 +1707,7 @@ fi $(hide) ln -sf /product-services $(TARGET_OUT)/product-services endef else -define create-system-productservices-symlink +define create-system-product-services-symlink endef endif @@ -1716,7 +1716,7 @@ define build-systemimage-target @echo "Target system fs image: $(1)" $(call create-system-vendor-symlink) $(call create-system-product-symlink) - $(call create-system-productservices-symlink) + $(call create-system-product-services-symlink) @mkdir -p $(dir $(1)) $(systemimage_intermediates) && rm -rf $(systemimage_intermediates)/system_image_info.txt $(call generate-image-prop-dictionary, $(systemimage_intermediates)/system_image_info.txt,system, \ skip_fsck=true) @@ -1796,7 +1796,7 @@ define build-systemtarball-target $(call pretty,"Target system fs tarball: $(INSTALLED_SYSTEMTARBALL_TARGET)") $(call create-system-vendor-symlink) $(call create-system-product-symlink) - $(call create-system-productservices-symlink) + $(call create-system-product-services-symlink) $(MKTARBALL) $(FS_GET_STATS) \ $(PRODUCT_OUT) system $(PRIVATE_SYSTEM_TAR) \ $(INSTALLED_SYSTEMTARBALL_TARGET) $(TARGET_OUT) @@ -2301,7 +2301,7 @@ INTERNAL_PRODUCT_SERVICESIMAGE_FILES := \ # platform.zip depends on $(INTERNAL_PRODUCT_SERVICESIMAGE_FILES). $(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_PRODUCT_SERVICESIMAGE_FILES) -INSTALLED_FILES_FILE_PRODUCT_SERVICES := $(PRODUCT_OUT)/installed-files-productservices.txt +INSTALLED_FILES_FILE_PRODUCT_SERVICES := $(PRODUCT_OUT)/installed-files-product-services.txt INSTALLED_FILES_JSON_PRODUCT_SERVICES := $(INSTALLED_FILES_FILE_PRODUCT_SERVICES:.txt=.json) $(INSTALLED_FILES_FILE_PRODUCT_SERVICES): .KATI_IMPLICIT_OUTPUTS := $(INSTALLED_FILES_JSON_PRODUCT_SERVICES) $(INSTALLED_FILES_FILE_PRODUCT_SERVICES) : $(INTERNAL_PRODUCT_SERVICESIMAGE_FILES) $(FILESLIST) @@ -2311,31 +2311,31 @@ $(INSTALLED_FILES_FILE_PRODUCT_SERVICES) : $(INTERNAL_PRODUCT_SERVICESIMAGE_FILE $(hide) $(FILESLIST) $(TARGET_OUT_PRODUCT_SERVICES) > $(@:.txt=.json) $(hide) build/tools/fileslist_util.py -c $(@:.txt=.json) > $@ -productservicesimage_intermediates := \ - $(call intermediates-dir-for,PACKAGING,productservices) +product_servicesimage_intermediates := \ + $(call intermediates-dir-for,PACKAGING,product_services) BUILT_PRODUCT_SERVICESIMAGE_TARGET := $(PRODUCT_OUT)/product-services.img -define build-productservicesimage-target +define build-product-servicesimage-target $(call pretty,"Target product-services fs image: $(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET)") @mkdir -p $(TARGET_OUT_PRODUCT_SERVICES) - @mkdir -p $(productservicesimage_intermediates) && rm -rf $(productservicesimage_intermediates)/productservices_image_info.txt - $(call generate-userimage-prop-dictionary, $(productservicesimage_intermediates)/productservices_image_info.txt, skip_fsck=true) + @mkdir -p $(product_servicesimage_intermediates) && rm -rf $(product_servicesimage_intermediates)/product_services_image_info.txt + $(call generate-image-prop-dictionary, $(product_servicesimage_intermediates)/product_services_image_info.txt,product_services, skip_fsck=true) $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \ ./build/tools/releasetools/build_image.py \ - $(TARGET_OUT_PRODUCT_SERVICES) $(productservicesimage_intermediates)/productservices_image_info.txt $(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET) $(TARGET_OUT) \ - $(productservicesimage_intermediates)/generated_productservices_image_info.txt + $(TARGET_OUT_PRODUCT_SERVICES) $(product_servicesimage_intermediates)/product_services_image_info.txt $(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET) $(TARGET_OUT) \ + $(product_servicesimage_intermediates)/generated_product_services_image_info.txt $(hide) $(call assert-max-image-size,$(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET),\ $(call read-image-prop-dictionary,\ - $(productservicesimage_intermediates)/generated_productservices_image_info.txt,productservices_size)) + $(product_servicesimage_intermediates)/generated_product_services_image_info.txt,product_services_size)) endef # We just build this directly to the install location. INSTALLED_PRODUCT_SERVICESIMAGE_TARGET := $(BUILT_PRODUCT_SERVICESIMAGE_TARGET) $(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET): $(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_PRODUCT_SERVICESIMAGE_FILES) $(INSTALLED_FILES_FILE_PRODUCT_SERVICES) $(BUILD_IMAGE_SRCS) - $(build-productservicesimage-target) + $(build-product-servicesimage-target) .PHONY: productservicesimage-nodeps psnod productservicesimage-nodeps psnod: | $(INTERNAL_USERIMAGES_DEPS) - $(build-productservicesimage-target) + $(build-product-servicesimage-target) sync: $(INTERNAL_PRODUCT_SERVICESIMAGE_FILES) @@ -2870,7 +2870,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \ @echo "Package target files: $@" $(call create-system-vendor-symlink) $(call create-system-product-symlink) - $(call create-system-productservices-symlink) + $(call create-system-product-services-symlink) $(hide) rm -rf $@ $@.list $(zip_root) $(hide) mkdir -p $(dir $@) $(zip_root) ifneq (,$(INSTALLED_RECOVERYIMAGE_TARGET)$(filter true,$(BOARD_USES_RECOVERY_AS_BOOT))) @@ -3138,7 +3138,7 @@ ifdef BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE $(hide) $(call fs_config,$(zip_root)/PRODUCT,product/) > $(zip_root)/META/product_filesystem_config.txt endif ifdef BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE - $(hide) $(call fs_config,$(zip_root)/PRODUCT_SERVICES,product-services/) > $(zip_root)/META/productservices_filesystem_config.txt + $(hide) $(call fs_config,$(zip_root)/PRODUCT_SERVICES,product-services/) > $(zip_root)/META/product_services_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 diff --git a/core/config.mk b/core/config.mk index d49d7d5f50..9b9f042569 100644 --- a/core/config.mk +++ b/core/config.mk @@ -948,10 +948,11 @@ endif ifdef BOARD_SUPER_PARTITION_PARTITION_LIST # BOARD_SUPER_PARTITION_PARTITION_LIST: a list of the following tokens -valid_super_partition_list := system vendor product productservices +valid_super_partition_list := system vendor product product_services ifneq (,$(filter-out $(valid_super_partition_list),$(BOARD_SUPER_PARTITION_PARTITION_LIST))) -$(error BOARD_SUPER_PARTITION_PARTITION_LIST contains invalid partition name. \ - Valid names are $(valid_super_partition_list).) +$(error BOARD_SUPER_PARTITION_PARTITION_LIST contains invalid partition name \ + ($(filter-out $(valid_super_partition_list),$(BOARD_SUPER_PARTITION_PARTITION_LIST))). \ + Valid names are $(valid_super_partition_list)) endif valid_super_partition_list := endif # BOARD_SUPER_PARTITION_PARTITION_LIST diff --git a/core/envsetup.mk b/core/envsetup.mk index d8469da448..c7c3f92f43 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -218,8 +218,8 @@ TARGET_COPY_OUT_PRODUCT := $(_product_path_placeholder) # A device can set up TARGET_COPY_OUT_PRODUCT_SERVICES to "product-services" in its # BoardConfig.mk. # We'll substitute with the real value after loading BoardConfig.mk. -_productservices_path_placeholder := ||PRODUCTSERVICES-PATH-PH|| -TARGET_COPY_OUT_PRODUCT_SERVICES := $(_productservices_path_placeholder) +_product_services_path_placeholder := ||PRODUCT-SERVICES-PATH-PH|| +TARGET_COPY_OUT_PRODUCT_SERVICES := $(_product_services_path_placeholder) ########################################### ################################################################# @@ -355,12 +355,12 @@ endif ########################################### # Now we can substitute with the real value of TARGET_COPY_OUT_PRODUCT_SERVICES -ifeq ($(TARGET_COPY_OUT_PRODUCT_SERVICES),$(_productservices_path_placeholder)) +ifeq ($(TARGET_COPY_OUT_PRODUCT_SERVICES),$(_product_services_path_placeholder)) TARGET_COPY_OUT_PRODUCT_SERVICES := system/product-services else ifeq ($(filter product-services system/product-services,$(TARGET_COPY_OUT_PRODUCT_SERVICES)),) $(error TARGET_COPY_OUT_PRODUCT_SERVICES must be either 'product-services' or 'system/product-services', seeing '$(TARGET_COPY_OUT_PRODUCT_SERVICES)'.) endif -PRODUCT_SERVICES_COPY_FILES := $(subst $(_productservices_path_placeholder),$(TARGET_COPY_OUT_PRODUCT_SERVICES),$(PRODUCT_SERVICES_COPY_FILES)) +PRODUCT_SERVICES_COPY_FILES := $(subst $(_product_services_path_placeholder),$(TARGET_COPY_OUT_PRODUCT_SERVICES),$(PRODUCT_SERVICES_COPY_FILES)) BOARD_USES_PRODUCT_SERVICESIMAGE := ifdef BOARD_PREBUILT_PRODUCT_SERVICESIMAGE @@ -916,33 +916,33 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_APPS_PRIVILEGED := $(TARGET_OUT_ TARGET_OUT_PRODUCT_SERVICES := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_PRODUCT_SERVICES) ifneq ($(filter address,$(SANITIZE_TARGET)),) -target_out_productservices_shared_libraries_base := $(PRODUCT_SERVICES_OUT)/$(TARGET_COPY_OUT_ASAN)/product-services +target_out_product_services_shared_libraries_base := $(PRODUCT_SERVICES_OUT)/$(TARGET_COPY_OUT_ASAN)/product-services 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_productservices_app_base := $(PRODUCT_SERVICES_OUT)/$(TARGET_COPY_OUT_ASAN)/product-services +target_out_product_services_app_base := $(PRODUCT_SERVICES_OUT)/$(TARGET_COPY_OUT_ASAN)/product-services else -target_out_productservices_app_base := $(TARGET_OUT_PRODUCT_SERVICES) +target_out_product_services_app_base := $(TARGET_OUT_PRODUCT_SERVICES) endif else -target_out_productservices_shared_libraries_base := $(TARGET_OUT_PRODUCT_SERVICES) -target_out_productservices_app_base := $(TARGET_OUT_PRODUCT_SERVICES) +target_out_product_services_shared_libraries_base := $(TARGET_OUT_PRODUCT_SERVICES) +target_out_product_services_app_base := $(TARGET_OUT_PRODUCT_SERVICES) endif ifeq ($(TARGET_IS_64_BIT),true) -TARGET_OUT_PRODUCT_SERVICES_SHARED_LIBRARIES := $(target_out_productservices_shared_libraries_base)/lib64 +TARGET_OUT_PRODUCT_SERVICES_SHARED_LIBRARIES := $(target_out_product_services_shared_libraries_base)/lib64 else -TARGET_OUT_PRODUCT_SERVICES_SHARED_LIBRARIES := $(target_out_productservices_shared_libraries_base)/lib +TARGET_OUT_PRODUCT_SERVICES_SHARED_LIBRARIES := $(target_out_product_services_shared_libraries_base)/lib endif TARGET_OUT_PRODUCT_SERVICES_JAVA_LIBRARIES:= $(TARGET_OUT_PRODUCT_SERVICES)/framework -TARGET_OUT_PRODUCT_SERVICES_APPS := $(target_out_productservices_app_base)/app -TARGET_OUT_PRODUCT_SERVICES_APPS_PRIVILEGED := $(target_out_productservices_app_base)/priv-app +TARGET_OUT_PRODUCT_SERVICES_APPS := $(target_out_product_services_app_base)/app +TARGET_OUT_PRODUCT_SERVICES_APPS_PRIVILEGED := $(target_out_product_services_app_base)/priv-app TARGET_OUT_PRODUCT_SERVICES_ETC := $(TARGET_OUT_PRODUCT_SERVICES)/etc ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true) -$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_SERVICES_SHARED_LIBRARIES := $(target_out_productservices_shared_libraries_base)/lib/$(TARGET_2ND_ARCH) +$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_SERVICES_SHARED_LIBRARIES := $(target_out_product_services_shared_libraries_base)/lib/$(TARGET_2ND_ARCH) else -$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_SERVICES_SHARED_LIBRARIES := $(target_out_productservices_shared_libraries_base)/lib +$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_SERVICES_SHARED_LIBRARIES := $(target_out_product_services_shared_libraries_base)/lib endif $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_SERVICES_APPS := $(TARGET_OUT_PRODUCT_SERVICES_APPS) $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_SERVICES_APPS_PRIVILEGED := $(TARGET_OUT_PRODUCT_SERVICES_APPS_PRIVILEGED) diff --git a/tools/releasetools/add_img_to_target_files.py b/tools/releasetools/add_img_to_target_files.py index 6a97182f2e..f7324bdbe8 100755 --- a/tools/releasetools/add_img_to_target_files.py +++ b/tools/releasetools/add_img_to_target_files.py @@ -653,11 +653,11 @@ def AddImagesToTargetFiles(filename): has_product = (os.path.isdir(os.path.join(OPTIONS.input_tmp, "PRODUCT")) or os.path.exists(os.path.join(OPTIONS.input_tmp, "IMAGES", "product.img"))) - has_productservices = (os.path.isdir(os.path.join(OPTIONS.input_tmp, - "PRODUCTSERVICES")) or - os.path.exists(os.path.join(OPTIONS.input_tmp, - "IMAGES", - "product-services.img"))) + has_product_services = (os.path.isdir(os.path.join(OPTIONS.input_tmp, + "PRODUCT_SERVICES")) or + os.path.exists(os.path.join(OPTIONS.input_tmp, + "IMAGES", + "product-services.img"))) has_system_other = os.path.isdir(os.path.join(OPTIONS.input_tmp, "SYSTEM_OTHER")) @@ -734,7 +734,7 @@ def AddImagesToTargetFiles(filename): banner("product") partitions['product'] = AddProduct(output_zip) - if has_productservices: + if has_product_services: banner("product-services") partitions['product-services'] = AddProductServices(output_zip) diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py index b7e114d8f9..6eee583c49 100755 --- a/tools/releasetools/build_image.py +++ b/tools/releasetools/build_image.py @@ -908,27 +908,27 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): d["extfs_rsv_pct"] = "0" copy_prop("product_reserved_size", "partition_reserved_size") elif mount_point == "product-services": - copy_prop("avb_productservices_hashtree_enable", "avb_hashtree_enable") - copy_prop("avb_productservices_add_hashtree_footer_args", + copy_prop("avb_product_services_hashtree_enable", "avb_hashtree_enable") + copy_prop("avb_product_services_add_hashtree_footer_args", "avb_add_hashtree_footer_args") - copy_prop("avb_productservices_key_path", "avb_key_path") - copy_prop("avb_productservices_algorithm", "avb_algorithm") - copy_prop("productservices_fs_type", "fs_type") - copy_prop("productservices_size", "partition_size") - if not copy_prop("productservices_journal_size", "journal_size"): + copy_prop("avb_product_services_key_path", "avb_key_path") + copy_prop("avb_product_services_algorithm", "avb_algorithm") + copy_prop("product_services_fs_type", "fs_type") + copy_prop("product_services_size", "partition_size") + if not copy_prop("product_services_journal_size", "journal_size"): d["journal_size"] = "0" - copy_prop("productservices_verity_block_device", "verity_block_device") - copy_prop("productservices_squashfs_compressor", "squashfs_compressor") - copy_prop("productservices_squashfs_compressor_opt", + copy_prop("product_services_verity_block_device", "verity_block_device") + copy_prop("product_services_squashfs_compressor", "squashfs_compressor") + copy_prop("product_services_squashfs_compressor_opt", "squashfs_compressor_opt") - copy_prop("productservices_squashfs_block_size", "squashfs_block_size") - copy_prop("productservices_squashfs_disable_4k_align", + copy_prop("product_services_squashfs_block_size", "squashfs_block_size") + copy_prop("product_services_squashfs_disable_4k_align", "squashfs_disable_4k_align") - copy_prop("productservices_base_fs_file", "base_fs_file") - copy_prop("productservices_extfs_inode_count", "extfs_inode_count") - if not copy_prop("productservices_extfs_rsv_pct", "extfs_rsv_pct"): + copy_prop("product_services_base_fs_file", "base_fs_file") + copy_prop("product_services_extfs_inode_count", "extfs_inode_count") + if not copy_prop("product_services_extfs_rsv_pct", "extfs_rsv_pct"): d["extfs_rsv_pct"] = "0" - copy_prop("productservices_reserved_size", "partition_reserved_size") + copy_prop("product_services_reserved_size", "partition_reserved_size") elif mount_point == "oem": copy_prop("fs_type", "fs_type") copy_prop("oem_size", "partition_size") @@ -977,7 +977,7 @@ def GlobalDictFromImageProp(image_prop, mount_point): elif mount_point == "product": copy_prop(size_property, "product_size") elif mount_point == "product-services": - copy_prop(size_property, "productservices_size") + copy_prop(size_property, "product_services_size") return d