am 24494187: Merge "SDK Addon multi-sys-img support, part 4." into lmp-dev (fac49734) · Commits · e / os / android_build

core/product.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,7 @@ _product_var_list := \
		PRODUCT_SDK_ADDON_COPY_FILES \
		PRODUCT_SDK_ADDON_COPY_MODULES \
		PRODUCT_SDK_ADDON_DOC_MODULES \
		PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP \
		PRODUCT_DEFAULT_WIFI_CHANNELS \
		PRODUCT_DEFAULT_DEV_CERTIFICATE \
		PRODUCT_RESTRICT_VENDOR_FILES \

core/tasks/sdk-addon.mk

+53 −19

Original line number	Diff line number	Diff line
		@@ -19,10 +19,11 @@ addon_name := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_NAME))
		ifneq ($(addon_name),)

		addon_dir_leaf := $(addon_name)-$(FILE_NAME_TAG)-$(INTERNAL_SDK_HOST_OS_NAME)

		addon_dir_img := $(addon_dir_leaf)-img
		intermediates := $(HOST_OUT_INTERMEDIATES)/SDK_ADDON/$(addon_name)_intermediates
		full_target := $(HOST_OUT_SDK_ADDON)/$(addon_dir_leaf).zip
		staging := $(intermediates)/$(addon_dir_leaf)
		full_target_img := $(HOST_OUT_SDK_ADDON)/$(addon_dir_img).zip
		staging := $(intermediates)

		sdk_addon_deps :=
		files_to_copy :=
		@@ -46,29 +47,54 @@ $(foreach cf,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_COPY_MODULES), \
		$(eval _src := $(call stub-addon-jar-file,$(_src))) \
		$(if $(_src),,$(eval $(error Unknown or unlinkable module: $(call word-colon,1,$(cf)). Requested by $(INTERNAL_PRODUCT)))) \
		$(eval _dest := $(call word-colon,2,$(cf))) \
		$(eval files_to_copy += $(_src):$(_dest)) \
		$(eval files_to_copy += $(addon_dir_leaf):$(_src):$(_dest)) \
		)
		endif

		# Files that are copied directly into the sdk-addon
		files_to_copy += $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_COPY_FILES)
		ifneq ($(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_COPY_FILES)),)
		$(foreach cf,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_COPY_FILES), \
		$(eval _src := $(call word-colon,1,$(cf))) \
		$(eval _dest := $(call word-colon,2,$(cf))) \
		$(if $(findstring images/,$(_dest)), $(eval _root := $(addon_dir_img)), $(eval _root := $(addon_dir_leaf))) \
		$(eval files_to_copy += $(_root):$(_src):$(_dest)) \
		)
		endif

		# All SDK add-ons have these files
		# Files copied in the system-image directory
		files_to_copy += \
		$(BUILT_SYSTEMIMAGE):images/$(TARGET_CPU_ABI)/system.img \
		$(BUILT_USERDATAIMAGE_TARGET):images/$(TARGET_CPU_ABI)/userdata.img \
		$(BUILT_RAMDISK_TARGET):images/$(TARGET_CPU_ABI)/ramdisk.img \
		$(PRODUCT_OUT)/system/build.prop:images/$(TARGET_CPU_ABI)/build.prop \
		$(target_notice_file_txt):images/$(TARGET_CPU_ABI)/NOTICE.txt
		$(addon_dir_img):$(BUILT_SYSTEMIMAGE):images/$(TARGET_CPU_ABI)/system.img \
		$(addon_dir_img):$(BUILT_USERDATAIMAGE_TARGET):images/$(TARGET_CPU_ABI)/userdata.img \
		$(addon_dir_img):$(BUILT_RAMDISK_TARGET):images/$(TARGET_CPU_ABI)/ramdisk.img \
		$(addon_dir_img):$(PRODUCT_OUT)/system/build.prop:images/$(TARGET_CPU_ABI)/build.prop \
		$(addon_dir_img):$(target_notice_file_txt):images/$(TARGET_CPU_ABI)/NOTICE.txt \
		$(addon_dir_img):$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP):images/source.properties

		# Generate rules to copy the requested files
		$(foreach cf,$(files_to_copy), \
		$(eval _src := $(call word-colon,1,$(cf))) \
		$(eval _dest := $(call append-path,$(staging),$(call word-colon,2,$(cf)))) \
		$(eval _root := $(call word-colon,1,$(cf))) \
		$(eval _src := $(call word-colon,2,$(cf))) \
		$(eval _dest := $(call append-path,$(call append-path,$(staging),$(_root)),$(call word-colon,3,$(cf)))) \
		$(eval $(call copy-one-file,$(_src),$(_dest))) \
		$(eval sdk_addon_deps += $(_dest)) \
		)

		# The system-image source.properties is a template that we directly expand in-place
		addon_img_source_prop := $(call append-path,$(staging),$(addon_dir_img))/images/source.properties
		sdk_addon_deps += $(addon_img_source_prop)

		$(addon_img_source_prop): $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP)
		@echo Generate $@
		$(hide) mkdir -p $(dir $@)
		$(hide) sed \
		-e 's/$${PLATFORM_VERSION}/$(PLATFORM_VERSION)/' \
		-e 's/$${PLATFORM_SDK_VERSION}/$(PLATFORM_SDK_VERSION)/' \
		-e 's/$${PLATFORM_VERSION_CODENAME}/$(subst REL,,$(PLATFORM_VERSION_CODENAME))/' \
		-e 's/$${TARGET_ARCH}/$(TARGET_ARCH)/' \
		-e 's/$${TARGET_CPU_ABI}/$(TARGET_CPU_ABI)/' \
		$< > $@ && sed -i -e '/^AndroidVersion.CodeName=\s*$$/d' $@


		# We don't know about all of the docs files, so depend on the timestamps for
		# them, and record the directories, and the packaging rule will just copy the
		# whole thing.
		@@ -76,7 +102,7 @@ doc_modules := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_DOC_MODU
		sdk_addon_deps += $(foreach dm, $(doc_modules), $(call doc-timestamp-for, $(dm)))
		$(full_target): PRIVATE_DOCS_DIRS := $(addprefix $(OUT_DOCS)/, $(doc_modules))

		$(full_target): PRIVATE_STAGING_DIR := $(staging)
		$(full_target): PRIVATE_STAGING_DIR := $(call append-path,$(staging),$(addon_dir_leaf))

		$(full_target): $(sdk_addon_deps) \| $(ACP)
		@echo Packaging SDK Addon: $@
		@@ -85,16 +111,24 @@ $(full_target): $(sdk_addon_deps) \| $(ACP)
		$(ACP) -r $$d $(PRIVATE_STAGING_DIR)/docs ;\
		done
		$(hide) mkdir -p $(dir $@)
		$(hide) ( F=$$(pwd)/$@ ; cd $(PRIVATE_STAGING_DIR)/.. && zip -rq $$F * )
		$(hide) ( F=$$(pwd)/$@ ; cd $(PRIVATE_STAGING_DIR)/.. && zip -rq $$F $(notdir $(PRIVATE_STAGING_DIR)) )

		$(full_target_img): PRIVATE_STAGING_DIR := $(call append-path,$(staging),$(addon_dir_img))
		$(full_target_img): $(full_target) $(addon_img_source_prop)
		@echo Packaging SDK Addon System-Image: $@
		$(hide) mkdir -p $(dir $@)
		$(hide) ( F=$$(pwd)/$@ ; cd $(PRIVATE_STAGING_DIR)/.. && zip -rq $$F $(notdir $(PRIVATE_STAGING_DIR)) )


		.PHONY: sdk_addon
		sdk_addon: $(full_target)
		sdk_addon: $(full_target) $(full_target_img)

		ifneq ($(sdk_repo_goal),)
		# If we're building the sdk_repo, keep the name of the addon zip
		# around so that development/build/tools/sdk_repo.mk can dist it
		# at the appropriate location.
		ADDON_SDK_ZIP := $(full_target)
		ADDON_SDK_IMG_ZIP := $(full_target_img)
		else
		# When not building an sdk_repo, just dist the addon zip file
		# as-is.