diff options
| author | Rohit Mungee <rohitm@google.com> | 2010-08-24 23:01:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 23:01:32 -0700 |
| commit | cdc1d6f45711bdfa5b71513c6d4e63cf5804bc56 (patch) | |
| tree | b72041749519f305be3e17119aca8ddfdedb4ec9 /core | |
| parent | 567ec8ede3e7cda75c1f3d474d14d78b12a6765f (diff) | |
| parent | cb92616f11f4eb07e9f11924c5ad8a78e6ab5bdd (diff) | |
| download | build-cdc1d6f45711bdfa5b71513c6d4e63cf5804bc56.zip build-cdc1d6f45711bdfa5b71513c6d4e63cf5804bc56.tar.gz build-cdc1d6f45711bdfa5b71513c6d4e63cf5804bc56.tar.bz2 | |
am cb92616f: Merge "Add support for multiple html directories to droiddoc." into gingerbread
Merge commit 'cb92616f11f4eb07e9f11924c5ad8a78e6ab5bdd' into gingerbread-plus-aosp
* commit 'cb92616f11f4eb07e9f11924c5ad8a78e6ab5bdd':
Add support for multiple html directories to droiddoc.
Diffstat (limited to 'core')
| -rw-r--r-- | core/droiddoc.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/droiddoc.mk b/core/droiddoc.mk index ba4857b..951ae3c 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -144,7 +144,7 @@ $(full_target): PRIVATE_IN_CUSTOM_ASSET_DIR := $(LOCAL_DROIDDOC_CUSTOM_TEMPLATE_ $(full_target): PRIVATE_OUT_ASSET_DIR := $(out_dir)/$(LOCAL_DROIDDOC_ASSET_DIR) $(full_target): PRIVATE_OUT_CUSTOM_ASSET_DIR := $(out_dir)/$(LOCAL_DROIDDOC_CUSTOM_ASSET_DIR) ifneq ($(strip $(LOCAL_DROIDDOC_HTML_DIR)),) -$(full_target): PRIVATE_DROIDDOC_HTML_DIR := -htmldir $(LOCAL_PATH)/$(LOCAL_DROIDDOC_HTML_DIR) +$(full_target): PRIVATE_DROIDDOC_HTML_DIR := $(foreach dir,$(LOCAL_DROIDDOC_HTML_DIR),-htmldir $(dir)) else $(full_target): PRIVATE_DROIDDOC_HTML_DIR := endif |