diff options
| author | Ying Wang <wangying@google.com> | 2011-11-11 10:52:12 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2011-11-11 10:52:12 -0800 |
| commit | a032d3d07372423176e072dfcbcf60a53f8a7d57 (patch) | |
| tree | 0c0f9fd0cbcec158e00d0504961cb505c5a15b7a | |
| parent | 4b87f575d45320260e35f224cd18f36eec5e3eb2 (diff) | |
| download | build-a032d3d07372423176e072dfcbcf60a53f8a7d57.zip build-a032d3d07372423176e072dfcbcf60a53f8a7d57.tar.gz build-a032d3d07372423176e072dfcbcf60a53f8a7d57.tar.bz2 | |
Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
Bug: 5429077
Change-Id: I8d962c803496479ba5b5e7316538aced65ee4df1
| -rw-r--r-- | core/product.mk | 2 | ||||
| -rw-r--r-- | core/tasks/sdk-addon.mk | 21 |
2 files changed, 9 insertions, 14 deletions
diff --git a/core/product.mk b/core/product.mk index 26f365d..f48d2be 100644 --- a/core/product.mk +++ b/core/product.mk @@ -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 \ diff --git a/core/tasks/sdk-addon.mk b/core/tasks/sdk-addon.mk index f3aec65..a864781 100644 --- a/core/tasks/sdk-addon.mk +++ b/core/tasks/sdk-addon.mk @@ -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 * ) |