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

am bb5ada52: am a032d3d0: Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES 

* commit 'bb5ada524c3c15132c832e076104d44ca7dde5ad':
  Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
This commit is contained in:
Ying Wang 2011-11-11 14:38:14 -08:00 committed by Android Git Automerger
parent 9ff0549621 bb5ada524c
commit 7deff5fc54
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/product.mk
View File

@ -81,7 +81,7 @@ _product_var_list := \
PRODUCT_SDK_ADDON_NAME \
PRODUCT_SDK_ADDON_COPY_FILES \
PRODUCT_SDK_ADDON_COPY_MODULES \
PRODUCT_SDK_ADDON_DOC_MODULE \
PRODUCT_SDK_ADDON_DOC_MODULES \
PRODUCT_DEFAULT_WIFI_CHANNELS \
PRODUCT_DEFAULT_DEV_CERTIFICATE \

21
core/tasks/sdk-addon.mk
View File

@ -69,26 +69,21 @@ $(foreach cf,$(files_to_copy), \
$(eval sdk_addon_deps += $(_dest)) \
)
# We don't know about all of the docs files, so depend on the timestamp for
# that, and record the directory, and the packaging rule will just copy the
# 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.
doc_module := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_DOC_MODULE))
ifneq ($(doc_module),)
doc_timestamp := $(call doc-timestamp-for, $(doc_module))
sdk_addon_deps += $(doc_timestamp)
$(full_target): PRIVATE_DOCS_DIR := $(OUT_DOCS)/$(doc_module)
else
$(full_target): PRIVATE_DOCS_DIR :=
endif
doc_modules := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_DOC_MODULES))
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): $(sdk_addon_deps) | $(ACP)
@echo Packaging SDK Addon: $@
$(hide) mkdir -p $(PRIVATE_STAGING_DIR)/docs/reference
$(hide) if [ -n "$(PRIVATE_DOCS_DIR)" ] ; then \
$(ACP) -r $(PRIVATE_DOCS_DIR)/* $(PRIVATE_STAGING_DIR)/docs/reference ;\
fi
$(hide) for d in $(PRIVATE_DOCS_DIRS); do \
$(ACP) -r $$d/* $(PRIVATE_STAGING_DIR)/docs/reference ;\
done
$(hide) mkdir -p $(dir $@)
$(hide) ( F=$$(pwd)/$@ ; cd $(PRIVATE_STAGING_DIR)/.. && zip -rq $$F * )