openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

s/product-services/product_services/g 

Attempting to reduce the number of different spellings we have for
"product services" partition in the codebase.

Bug: 112431447
Test: m
Change-Id: I6debd3f5f5abc4bd1e22f2ef11c5fe131915976c
Merged-In: I6debd3f5f5abc4bd1e22f2ef11c5fe131915976c
This commit is contained in:
Dario Freni 2018-08-17 00:56:14 +01:00 committed by Yifan Hong
parent 35be6ca8f2
commit 924af7d4dd
9 changed files with 59 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CleanSpec.mk
View File

@ -495,6 +495,10 @@ $(call add-clean-step, find $(PRODUCT_OUT) -type f -name "vr_hwc*" -print0 | xar
$(call add-clean-step, rm -rf $(SOONG_OUT_DIR)/.intermediates/system/vold) $(call add-clean-step, rm -rf $(SOONG_OUT_DIR)/.intermediates/system/vold)
# Remove product-services related files / images
$(call add-clean-step, find $(PRODUCT_OUT) -type f -name "*product-services*" -print0 | xargs -0 rm -rf)
$(call add-clean-step, find $(PRODUCT_OUT) -type d -name "*product-services*" -print0 | xargs -0 rm -rf)
# ************************************************ # ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************ # ************************************************

52
core/Makefile
View File

@ -516,7 +516,7 @@ $(INSTALLED_ODM_BUILD_PROP_TARGET): $(DEVICE_BUILDINFO_SH)
$(hide) build/make/tools/post_process_props.py $@ $(hide) build/make/tools/post_process_props.py $@
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# product-services build.prop # product_services build.prop
INSTALLED_PRODUCT_SERVICES_BUILD_PROP_TARGET := $(TARGET_OUT_PRODUCT_SERVICES)/build.prop INSTALLED_PRODUCT_SERVICES_BUILD_PROP_TARGET := $(TARGET_OUT_PRODUCT_SERVICES)/build.prop
ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_PRODUCT_SERVICES_BUILD_PROP_TARGET) ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_PRODUCT_SERVICES_BUILD_PROP_TARGET)
@ -526,7 +526,7 @@ FINAL_PRODUCT_SERVICES_PROPERTIES := $(call uniq-pairs-by-first-component, \
$(FINAL_PRODUCT_SERVICES_PROPERTIES),=) $(FINAL_PRODUCT_SERVICES_PROPERTIES),=)
$(INSTALLED_PRODUCT_SERVICES_BUILD_PROP_TARGET): $(INSTALLED_PRODUCT_SERVICES_BUILD_PROP_TARGET):
@echo Target product-services buildinfo: $@ @echo Target product_services buildinfo: $@
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) echo > $@ $(hide) echo > $@
ifdef BOARD_USES_PRODUCT_SERVICESIMAGE ifdef BOARD_USES_PRODUCT_SERVICESIMAGE
@ -1821,18 +1821,18 @@ define create-system-product-symlink
endef endef
endif endif
# Create symlink /system/product-services to /product-services if necessary. # Create symlink /system/product_services to /product_services if necessary.
ifdef BOARD_USES_PRODUCT_SERVICESIMAGE ifdef BOARD_USES_PRODUCT_SERVICESIMAGE
define create-system-product-services-symlink define create-system-product_services-symlink
$(hide) if [ -d $(TARGET_OUT)/product-services ] && [ ! -h $(TARGET_OUT)/product-services ]; then \ $(hide) if [ -d $(TARGET_OUT)/product_services ] && [ ! -h $(TARGET_OUT)/product_services ]; then \
echo 'Non-symlink $(TARGET_OUT)/product-services detected!' 1>&2; \ 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; \ echo 'You cannot install files to $(TARGET_OUT)/product_services while building a separate product_services.img!' 1>&2; \
exit 1; \ exit 1; \
fi fi
$(hide) ln -sf /product-services $(TARGET_OUT)/product-services $(hide) ln -sf /product_services $(TARGET_OUT)/product_services
endef endef
else else
define create-system-product-services-symlink define create-system-product_services-symlink
endef endef
endif endif
@ -1856,7 +1856,7 @@ define build-systemimage-target
@echo "Target system fs image: $(1)" @echo "Target system fs image: $(1)"
$(call create-system-vendor-symlink) $(call create-system-vendor-symlink)
$(call create-system-product-symlink) $(call create-system-product-symlink)
$(call create-system-product-services-symlink) $(call create-system-product_services-symlink)
@mkdir -p $(dir $(1)) $(systemimage_intermediates) && rm -rf $(systemimage_intermediates)/system_image_info.txt @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, \ $(call generate-image-prop-dictionary, $(systemimage_intermediates)/system_image_info.txt,system, \
skip_fsck=true) skip_fsck=true)
@ -1937,7 +1937,7 @@ define build-systemtarball-target
$(call pretty,"Target system fs tarball: $(INSTALLED_SYSTEMTARBALL_TARGET)") $(call pretty,"Target system fs tarball: $(INSTALLED_SYSTEMTARBALL_TARGET)")
$(call create-system-vendor-symlink) $(call create-system-vendor-symlink)
$(call create-system-product-symlink) $(call create-system-product-symlink)
$(call create-system-product-services-symlink) $(call create-system-product_services-symlink)
$(MKTARBALL) $(FS_GET_STATS) \ $(MKTARBALL) $(FS_GET_STATS) \
$(PRODUCT_OUT) system $(PRIVATE_SYSTEM_TAR) \ $(PRODUCT_OUT) system $(PRIVATE_SYSTEM_TAR) \
$(INSTALLED_SYSTEMTARBALL_TARGET) $(TARGET_OUT) $(INSTALLED_SYSTEMTARBALL_TARGET) $(TARGET_OUT)
@ -2436,7 +2436,7 @@ $(eval $(call copy-one-file,$(BOARD_PREBUILT_PRODUCTIMAGE),$(INSTALLED_PRODUCTIM
endif endif
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# product-services partition image # product_services partition image
ifdef BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE ifdef BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE
INTERNAL_PRODUCT_SERVICESIMAGE_FILES := \ INTERNAL_PRODUCT_SERVICESIMAGE_FILES := \
$(filter $(TARGET_OUT_PRODUCT_SERVICES)/%,\ $(filter $(TARGET_OUT_PRODUCT_SERVICES)/%,\
@ -2447,7 +2447,7 @@ INTERNAL_PRODUCT_SERVICESIMAGE_FILES := \
# platform.zip depends on $(INTERNAL_PRODUCT_SERVICESIMAGE_FILES). # platform.zip depends on $(INTERNAL_PRODUCT_SERVICESIMAGE_FILES).
$(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_PRODUCT_SERVICESIMAGE_FILES) $(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_PRODUCT_SERVICESIMAGE_FILES)
INSTALLED_FILES_FILE_PRODUCT_SERVICES := $(PRODUCT_OUT)/installed-files-product-services.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_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): .KATI_IMPLICIT_OUTPUTS := $(INSTALLED_FILES_JSON_PRODUCT_SERVICES)
$(INSTALLED_FILES_FILE_PRODUCT_SERVICES) : $(INTERNAL_PRODUCT_SERVICESIMAGE_FILES) $(FILESLIST) $(INSTALLED_FILES_FILE_PRODUCT_SERVICES) : $(INTERNAL_PRODUCT_SERVICESIMAGE_FILES) $(FILESLIST)
@ -2459,9 +2459,9 @@ $(INSTALLED_FILES_FILE_PRODUCT_SERVICES) : $(INTERNAL_PRODUCT_SERVICESIMAGE_FILE
product_servicesimage_intermediates := \ product_servicesimage_intermediates := \
$(call intermediates-dir-for,PACKAGING,product_services) $(call intermediates-dir-for,PACKAGING,product_services)
BUILT_PRODUCT_SERVICESIMAGE_TARGET := $(PRODUCT_OUT)/product-services.img BUILT_PRODUCT_SERVICESIMAGE_TARGET := $(PRODUCT_OUT)/product_services.img
define build-product-servicesimage-target define build-product_servicesimage-target
$(call pretty,"Target product-services fs image: $(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET)") $(call pretty,"Target product_services fs image: $(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET)")
@mkdir -p $(TARGET_OUT_PRODUCT_SERVICES) @mkdir -p $(TARGET_OUT_PRODUCT_SERVICES)
@mkdir -p $(product_servicesimage_intermediates) && rm -rf $(product_servicesimage_intermediates)/product_services_image_info.txt @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) $(call generate-image-prop-dictionary, $(product_servicesimage_intermediates)/product_services_image_info.txt,product_services, skip_fsck=true)
@ -2477,16 +2477,16 @@ endef
# We just build this directly to the install location. # We just build this directly to the install location.
INSTALLED_PRODUCT_SERVICESIMAGE_TARGET := $(BUILT_PRODUCT_SERVICESIMAGE_TARGET) 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) $(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET): $(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_PRODUCT_SERVICESIMAGE_FILES) $(INSTALLED_FILES_FILE_PRODUCT_SERVICES) $(BUILD_IMAGE_SRCS)
$(build-product-servicesimage-target) $(build-product_servicesimage-target)
.PHONY: productservicesimage-nodeps psnod .PHONY: productservicesimage-nodeps psnod
productservicesimage-nodeps psnod: | $(INTERNAL_USERIMAGES_DEPS) productservicesimage-nodeps psnod: | $(INTERNAL_USERIMAGES_DEPS)
$(build-product-servicesimage-target) $(build-product_servicesimage-target)
sync: $(INTERNAL_PRODUCT_SERVICESIMAGE_FILES) sync: $(INTERNAL_PRODUCT_SERVICESIMAGE_FILES)
else ifdef BOARD_PREBUILT_PRODUCT_SERVICESIMAGE else ifdef BOARD_PREBUILT_PRODUCT_SERVICESIMAGE
INSTALLED_PRODUCT_SERVICESIMAGE_TARGET := $(PRODUCT_OUT)/product-services.img INSTALLED_PRODUCT_SERVICESIMAGE_TARGET := $(PRODUCT_OUT)/product_services.img
$(eval $(call copy-one-file,$(BOARD_PREBUILT_PRODUCT_SERVICESIMAGE),$(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET))) $(eval $(call copy-one-file,$(BOARD_PREBUILT_PRODUCT_SERVICESIMAGE),$(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET)))
endif endif
@ -2722,7 +2722,7 @@ define extract-avb-chain-public-keys
--output $(1)/product.avbpubkey) --output $(1)/product.avbpubkey)
$(if $(BOARD_AVB_PRODUCT_SERVICES_KEY_PATH),\ $(if $(BOARD_AVB_PRODUCT_SERVICES_KEY_PATH),\
$(hide) $(AVBTOOL) extract_public_key --key $(BOARD_AVB_PRODUCT_SERVICES_KEY_PATH) \ $(hide) $(AVBTOOL) extract_public_key --key $(BOARD_AVB_PRODUCT_SERVICES_KEY_PATH) \
--output $(1)/product-services.avbpubkey) --output $(1)/product_services.avbpubkey)
$(if $(BOARD_AVB_ODM_KEY_PATH),\ $(if $(BOARD_AVB_ODM_KEY_PATH),\
$(hide) $(AVBTOOL) extract_public_key --key $(BOARD_AVB_ODM_KEY_PATH) \ $(hide) $(AVBTOOL) extract_public_key --key $(BOARD_AVB_ODM_KEY_PATH) \
--output $(1)/odm.avbpubkey) --output $(1)/odm.avbpubkey)
@ -3137,7 +3137,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \
@echo "Package target files: $@" @echo "Package target files: $@"
$(call create-system-vendor-symlink) $(call create-system-vendor-symlink)
$(call create-system-product-symlink) $(call create-system-product-symlink)
$(call create-system-product-services-symlink) $(call create-system-product_services-symlink)
$(call create-vendor-odm-symlink) $(call create-vendor-odm-symlink)
$(hide) rm -rf $@ $@.list $(zip_root) $(hide) rm -rf $@ $@.list $(zip_root)
$(hide) mkdir -p $(dir $@) $(zip_root) $(hide) mkdir -p $(dir $@) $(zip_root)
@ -3213,7 +3213,7 @@ ifdef BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE
$(TARGET_OUT_PRODUCT),$(zip_root)/PRODUCT) $(TARGET_OUT_PRODUCT),$(zip_root)/PRODUCT)
endif endif
ifdef BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE ifdef BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE
@# Contents of the product-services image @# Contents of the product_services image
$(hide) $(call package_files-copy-root, \ $(hide) $(call package_files-copy-root, \
$(TARGET_OUT_PRODUCT_SERVICES),$(zip_root)/PRODUCT_SERVICES) $(TARGET_OUT_PRODUCT_SERVICES),$(zip_root)/PRODUCT_SERVICES)
endif endif
@ -3419,7 +3419,7 @@ ifdef BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE
$(hide) $(call fs_config,$(zip_root)/PRODUCT,product/) > $(zip_root)/META/product_filesystem_config.txt $(hide) $(call fs_config,$(zip_root)/PRODUCT,product/) > $(zip_root)/META/product_filesystem_config.txt
endif endif
ifdef BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE 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 $(hide) $(call fs_config,$(zip_root)/PRODUCT_SERVICES,product_services/) > $(zip_root)/META/product_services_filesystem_config.txt
endif endif
ifdef BOARD_ODMIMAGE_FILE_SYSTEM_TYPE ifdef BOARD_ODMIMAGE_FILE_SYSTEM_TYPE
$(hide) $(call fs_config,$(zip_root)/ODM,odm/) > $(zip_root)/META/odm_filesystem_config.txt $(hide) $(call fs_config,$(zip_root)/ODM,odm/) > $(zip_root)/META/odm_filesystem_config.txt
@ -3709,10 +3709,10 @@ productimage: $(INSTALLED_QEMU_PRODUCTIMAGE)
droidcore: $(INSTALLED_QEMU_PRODUCTIMAGE) droidcore: $(INSTALLED_QEMU_PRODUCTIMAGE)
endif endif
ifeq ($(BOARD_USES_PRODUCT_SERVICESIMAGE),true) ifeq ($(BOARD_USES_PRODUCT_SERVICESIMAGE),true)
INSTALLED_QEMU_PRODUCT_SERVICESIMAGE := $(PRODUCT_OUT)/product-services-qemu.img INSTALLED_QEMU_PRODUCT_SERVICESIMAGE := $(PRODUCT_OUT)/product_services-qemu.img
$(INSTALLED_QEMU_PRODUCT_SERVICESIMAGE): $(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET) $(MK_QEMU_IMAGE_SH) $(SGDISK_HOST) $(SIMG2IMG) $(INSTALLED_QEMU_PRODUCT_SERVICESIMAGE): $(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET) $(MK_QEMU_IMAGE_SH) $(SGDISK_HOST) $(SIMG2IMG)
@echo Create product-services-qemu.img @echo Create product_services-qemu.img
(export SGDISK=$(SGDISK_HOST) SIMG2IMG=$(SIMG2IMG); $(MK_QEMU_IMAGE_SH) ${PRODUCT_OUT}/product-services.img) (export SGDISK=$(SGDISK_HOST) SIMG2IMG=$(SIMG2IMG); $(MK_QEMU_IMAGE_SH) ${PRODUCT_OUT}/product_services.img)
productservicesimage: $(INSTALLED_QEMU_PRODUCT_SERVICESIMAGE) productservicesimage: $(INSTALLED_QEMU_PRODUCT_SERVICESIMAGE)
droidcore: $(INSTALLED_QEMU_PRODUCT_SERVICESIMAGE) droidcore: $(INSTALLED_QEMU_PRODUCT_SERVICESIMAGE)

20
core/envsetup.mk
View File

@ -180,7 +180,7 @@ TARGET_COPY_OUT_ASAN := $(TARGET_COPY_OUT_DATA)/asan
TARGET_COPY_OUT_OEM := oem TARGET_COPY_OUT_OEM := oem
TARGET_COPY_OUT_ODM := odm TARGET_COPY_OUT_ODM := odm
TARGET_COPY_OUT_PRODUCT := product TARGET_COPY_OUT_PRODUCT := product
TARGET_COPY_OUT_PRODUCT_SERVICES := product-services TARGET_COPY_OUT_PRODUCT_SERVICES := product_services
TARGET_COPY_OUT_ROOT := root TARGET_COPY_OUT_ROOT := root
TARGET_COPY_OUT_RECOVERY := recovery TARGET_COPY_OUT_RECOVERY := recovery
@ -213,9 +213,9 @@ TARGET_COPY_OUT_PRODUCT := $(_product_path_placeholder)
########################################### ###########################################
# Define TARGET_COPY_OUT_PRODUCT_SERVICES to a placeholder, for at this point # Define TARGET_COPY_OUT_PRODUCT_SERVICES to a placeholder, for at this point
# we don't know if the device wants to build a separate product-services.img # we don't know if the device wants to build a separate product_services.img
# or just build product stuff into system.img. # or just build product stuff into system.img.
# A device can set up TARGET_COPY_OUT_PRODUCT_SERVICES to "product-services" in its # A device can set up TARGET_COPY_OUT_PRODUCT_SERVICES to "product_services" in its
# BoardConfig.mk. # BoardConfig.mk.
# We'll substitute with the real value after loading BoardConfig.mk. # We'll substitute with the real value after loading BoardConfig.mk.
_product_services_path_placeholder := ||PRODUCT_SERVICES-PATH-PH|| _product_services_path_placeholder := ||PRODUCT_SERVICES-PATH-PH||
@ -366,9 +366,9 @@ endif
########################################### ###########################################
# Now we can substitute with the real value of TARGET_COPY_OUT_PRODUCT_SERVICES # Now we can substitute with the real value of TARGET_COPY_OUT_PRODUCT_SERVICES
ifeq ($(TARGET_COPY_OUT_PRODUCT_SERVICES),$(_product_services_path_placeholder)) ifeq ($(TARGET_COPY_OUT_PRODUCT_SERVICES),$(_product_services_path_placeholder))
TARGET_COPY_OUT_PRODUCT_SERVICES := system/product-services TARGET_COPY_OUT_PRODUCT_SERVICES := system/product_services
else ifeq ($(filter product-services system/product-services,$(TARGET_COPY_OUT_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)'.) $(error TARGET_COPY_OUT_PRODUCT_SERVICES must be either 'product_services' or 'system/product_services', seeing '$(TARGET_COPY_OUT_PRODUCT_SERVICES)'.)
endif endif
PRODUCT_SERVICES_COPY_FILES := $(subst $(_product_services_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))
@ -379,10 +379,10 @@ endif
ifdef BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE ifdef BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE
BOARD_USES_PRODUCT_SERVICESIMAGE := true BOARD_USES_PRODUCT_SERVICESIMAGE := true
endif endif
ifeq ($(TARGET_COPY_OUT_PRODUCT_SERVICES),product-services) ifeq ($(TARGET_COPY_OUT_PRODUCT_SERVICES),product_services)
BOARD_USES_PRODUCT_SERVICESIMAGE := true BOARD_USES_PRODUCT_SERVICESIMAGE := true
else ifdef BOARD_USES_PRODUCT_SERVICESIMAGE else ifdef BOARD_USES_PRODUCT_SERVICESIMAGE
$(error TARGET_COPY_OUT_PRODUCT_SERVICES must be set to 'product-services' to use a product-services image) $(error TARGET_COPY_OUT_PRODUCT_SERVICES must be set to 'product_services' to use a product_services image)
endif endif
########################################### ###########################################
@ -974,11 +974,11 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_PRODUCT_APPS_PRIVILEGED := $(TARGET_OUT_
TARGET_OUT_PRODUCT_SERVICES := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_PRODUCT_SERVICES) TARGET_OUT_PRODUCT_SERVICES := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_PRODUCT_SERVICES)
ifneq ($(filter address,$(SANITIZE_TARGET)),) ifneq ($(filter address,$(SANITIZE_TARGET)),)
target_out_product_services_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) ifeq ($(SANITIZE_LITE),true)
# When using SANITIZE_LITE, APKs must not be packaged with sanitized libraries, as they will not # 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/. # work with unsanitized app_process. For simplicity, generate APKs into /data/asan/.
target_out_product_services_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 else
target_out_product_services_app_base := $(TARGET_OUT_PRODUCT_SERVICES) target_out_product_services_app_base := $(TARGET_OUT_PRODUCT_SERVICES)
endif endif

2
core/package_internal.mk
View File

@ -592,7 +592,7 @@ else
endif endif
endif endif
# Run veridex on product, product-services and vendor modules. # Run veridex on product, product_services and vendor modules.
# We skip it for unbundled app builds where we cannot build veridex. # We skip it for unbundled app builds where we cannot build veridex.
module_run_appcompat := module_run_appcompat :=
ifeq (true,$(filter true, \ ifeq (true,$(filter true, \

2
core/prebuilt_internal.mk
View File

@ -95,7 +95,7 @@ else
prebuilt_module_is_dex_javalib := prebuilt_module_is_dex_javalib :=
endif endif
# Run veridex on product, product-services and vendor modules. # Run veridex on product, product_services and vendor modules.
# We skip it for unbundled app builds where we cannot build veridex. # We skip it for unbundled app builds where we cannot build veridex.
module_run_appcompat := module_run_appcompat :=
ifeq (true,$(filter true, \ ifeq (true,$(filter true, \

2
help.sh
View File

@ -40,7 +40,7 @@ Common goals are:
Stands for "Vendor, NO Dependencies" Stands for "Vendor, NO Dependencies"
pnod Quickly rebuild the product image from built packages pnod Quickly rebuild the product image from built packages
Stands for "Product, NO Dependencies" Stands for "Product, NO Dependencies"
psnod Quickly rebuild the product-services image from built packages psnod Quickly rebuild the product_services image from built packages
Stands for "ProductServices, NO Dependencies" Stands for "ProductServices, NO Dependencies"
onod Quickly rebuild the odm image from built packages onod Quickly rebuild the odm image from built packages
Stands for "ODM, NO Dependencies" Stands for "ODM, NO Dependencies"

22
tools/releasetools/add_img_to_target_files.py
View File

@ -73,7 +73,7 @@ OPTIONS.replace_verity_private_key = False
OPTIONS.is_signing = False OPTIONS.is_signing = False
# Partitions that should have their care_map added to META/care_map.txt. # Partitions that should have their care_map added to META/care_map.txt.
PARTITIONS_WITH_CARE_MAP = ('system', 'vendor', 'product', 'product-services', PARTITIONS_WITH_CARE_MAP = ('system', 'vendor', 'product', 'product_services',
'odm') 'odm')
# Use a fixed timestamp (01/01/2009 00:00:00 UTC) for files when packaging # Use a fixed timestamp (01/01/2009 00:00:00 UTC) for files when packaging
# images. (b/24377993, b/80600931) # images. (b/24377993, b/80600931)
@ -200,19 +200,19 @@ def AddProduct(output_zip):
def AddProductServices(output_zip): def AddProductServices(output_zip):
"""Turn the contents of PRODUCT_SERVICES into a product-services image and """Turn the contents of PRODUCT_SERVICES into a product_services image and
store it in output_zip.""" store it in output_zip."""
img = OutputFile(output_zip, OPTIONS.input_tmp, "IMAGES", img = OutputFile(output_zip, OPTIONS.input_tmp, "IMAGES",
"product-services.img") "product_services.img")
if os.path.exists(img.input_name): if os.path.exists(img.input_name):
print("product-services.img already exists; no need to rebuild...") print("product_services.img already exists; no need to rebuild...")
return img.input_name return img.input_name
block_list = OutputFile( block_list = OutputFile(
output_zip, OPTIONS.input_tmp, "IMAGES", "product-services.map") output_zip, OPTIONS.input_tmp, "IMAGES", "product_services.map")
CreateImage( CreateImage(
OPTIONS.input_tmp, OPTIONS.info_dict, "product-services", img, OPTIONS.input_tmp, OPTIONS.info_dict, "product_services", img,
block_list=block_list) block_list=block_list)
return img.name return img.name
@ -666,10 +666,10 @@ def AddImagesToTargetFiles(filename):
has_recovery = OPTIONS.info_dict.get("no_recovery") != "true" has_recovery = OPTIONS.info_dict.get("no_recovery") != "true"
# {vendor,odm,product,product-services}.img are unlike system.img or # {vendor,odm,product,product_services}.img are unlike system.img or
# system_other.img. Because it could be built from source, or dropped into # system_other.img. Because it could be built from source, or dropped into
# target_files.zip as a prebuilt blob. We consider either of them as # target_files.zip as a prebuilt blob. We consider either of them as
# {vendor,product,product-services}.img being available, which could be # {vendor,product,product_services}.img being available, which could be
# used when generating vbmeta.img for AVB. # used when generating vbmeta.img for AVB.
has_vendor = (os.path.isdir(os.path.join(OPTIONS.input_tmp, "VENDOR")) or has_vendor = (os.path.isdir(os.path.join(OPTIONS.input_tmp, "VENDOR")) or
os.path.exists(os.path.join(OPTIONS.input_tmp, "IMAGES", os.path.exists(os.path.join(OPTIONS.input_tmp, "IMAGES",
@ -684,7 +684,7 @@ def AddImagesToTargetFiles(filename):
"PRODUCT_SERVICES")) or "PRODUCT_SERVICES")) or
os.path.exists(os.path.join(OPTIONS.input_tmp, os.path.exists(os.path.join(OPTIONS.input_tmp,
"IMAGES", "IMAGES",
"product-services.img"))) "product_services.img")))
has_system_other = os.path.isdir(os.path.join(OPTIONS.input_tmp, has_system_other = os.path.isdir(os.path.join(OPTIONS.input_tmp,
"SYSTEM_OTHER")) "SYSTEM_OTHER"))
@ -762,8 +762,8 @@ def AddImagesToTargetFiles(filename):
partitions['product'] = AddProduct(output_zip) partitions['product'] = AddProduct(output_zip)
if has_product_services: if has_product_services:
banner("product-services") banner("product_services")
partitions['product-services'] = AddProductServices(output_zip) partitions['product_services'] = AddProductServices(output_zip)
if has_odm: if has_odm:
banner("odm") banner("odm")

8
tools/releasetools/build_image.py
View File

@ -909,7 +909,7 @@ def ImagePropFromGlobalDict(glob_dict, mount_point):
if not copy_prop("product_extfs_rsv_pct", "extfs_rsv_pct"): if not copy_prop("product_extfs_rsv_pct", "extfs_rsv_pct"):
d["extfs_rsv_pct"] = "0" d["extfs_rsv_pct"] = "0"
copy_prop("product_reserved_size", "partition_reserved_size") copy_prop("product_reserved_size", "partition_reserved_size")
elif mount_point == "product-services": elif mount_point == "product_services":
copy_prop("avb_product_services_hashtree_enable", "avb_hashtree_enable") copy_prop("avb_product_services_hashtree_enable", "avb_hashtree_enable")
copy_prop("avb_product_services_add_hashtree_footer_args", copy_prop("avb_product_services_add_hashtree_footer_args",
"avb_add_hashtree_footer_args") "avb_add_hashtree_footer_args")
@ -1000,7 +1000,7 @@ def GlobalDictFromImageProp(image_prop, mount_point):
copy_prop(size_property, "odm_size") copy_prop(size_property, "odm_size")
elif mount_point == "product": elif mount_point == "product":
copy_prop(size_property, "product_size") copy_prop(size_property, "product_size")
elif mount_point == "product-services": elif mount_point == "product_services":
copy_prop(size_property, "product_services_size") copy_prop(size_property, "product_services_size")
return d return d
@ -1045,8 +1045,8 @@ def main(argv):
mount_point = "oem" mount_point = "oem"
elif image_filename == "product.img": elif image_filename == "product.img":
mount_point = "product" mount_point = "product"
elif image_filename == "product-services.img": elif image_filename == "product_services.img":
mount_point = "product-services" mount_point = "product_services"
else: else:
print("error: unknown image file name ", image_filename, file=sys.stderr) print("error: unknown image file name ", image_filename, file=sys.stderr)
sys.exit(1) sys.exit(1)

2
tools/releasetools/common.py
View File

@ -79,7 +79,7 @@ SPECIAL_CERT_STRINGS = ("PRESIGNED", "EXTERNAL")
# The partitions allowed to be signed by AVB (Android verified boot 2.0). # The partitions allowed to be signed by AVB (Android verified boot 2.0).
AVB_PARTITIONS = ('boot', 'recovery', 'system', 'vendor', 'product', AVB_PARTITIONS = ('boot', 'recovery', 'system', 'vendor', 'product',
'product-services', 'dtbo', 'odm') 'product_services', 'dtbo', 'odm')
class ErrorCode(object): class ErrorCode(object):