summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMarius Renn <renn@google.com>2011-11-30 10:51:17 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-30 10:51:17 -0800
commit33abebcc3f53ff018dc7954cd32db05d22b054c1 (patch)
tree37eb3237edce8fbe04f92683e1fd0f825843383c /core
parent26dea7a3e2f053ab861138a771610be4fc270a77 (diff)
parentf945235a8adc6b163a0e46941791bb305ef37034 (diff)
downloadbuild-33abebcc3f53ff018dc7954cd32db05d22b054c1.zip
build-33abebcc3f53ff018dc7954cd32db05d22b054c1.tar.gz
build-33abebcc3f53ff018dc7954cd32db05d22b054c1.tar.bz2
am f945235a: am 72db32c7: Merge "Google Add-On API Documentation Fixes (5429077)" into ics-mr1
* commit 'f945235a8adc6b163a0e46941791bb305ef37034': Google Add-On API Documentation Fixes (5429077)
Diffstat (limited to 'core')
-rw-r--r--core/tasks/sdk-addon.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/tasks/sdk-addon.mk b/core/tasks/sdk-addon.mk
index a864781..5a24a00 100644
--- a/core/tasks/sdk-addon.mk
+++ b/core/tasks/sdk-addon.mk
@@ -80,9 +80,9 @@ $(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) mkdir -p $(PRIVATE_STAGING_DIR)/docs
$(hide) for d in $(PRIVATE_DOCS_DIRS); do \
- $(ACP) -r $$d/* $(PRIVATE_STAGING_DIR)/docs/reference ;\
+ $(ACP) -r $$d $(PRIVATE_STAGING_DIR)/docs ;\
done
$(hide) mkdir -p $(dir $@)
$(hide) ( F=$$(pwd)/$@ ; cd $(PRIVATE_STAGING_DIR)/.. && zip -rq $$F * )