diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-08-25 15:07:39 -0700 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2010-08-31 10:13:25 -0700 |
| commit | d77248ac7e1c05d7e5c16dd6df7e2067a2791e7b (patch) | |
| tree | f58ce7931b95abbe6e6470f8c74e34f02c74a68b /core/droiddoc.mk | |
| parent | 36aa8c3798193a7f9eb8db3ab7d4c48c786ddf76 (diff) | |
| download | build-d77248ac7e1c05d7e5c16dd6df7e2067a2791e7b.zip build-d77248ac7e1c05d7e5c16dd6df7e2067a2791e7b.tar.gz build-d77248ac7e1c05d7e5c16dd6df7e2067a2791e7b.tar.bz2 | |
Remove droiddoc/templates dir in favor of templates-sdk, move Android-specific assets to templates-sdk, add copies to templates-pdk as workaround.
Change-Id: Iad7d0f1955e5731ee9cebb8828a45bf3c297417b
Diffstat (limited to 'core/droiddoc.mk')
| -rw-r--r-- | core/droiddoc.mk | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/core/droiddoc.mk b/core/droiddoc.mk index 3703d6b..11d8f58 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -40,11 +40,8 @@ ifeq ($(LOCAL_DROIDDOC_SOURCE_PATH),) LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH) endif -ifeq ($(LOCAL_DROIDDOC_TEMPLATE_DIR),) -LOCAL_DROIDDOC_TEMPLATE_DIR := $(SRC_DROIDDOC_DIR)/templates -endif ifeq ($(LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR),) -LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR := $(SRC_DROIDDOC_DIR)/templates +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR := $(SRC_DROIDDOC_DIR)/$(LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR) endif ifeq ($(LOCAL_DROIDDOC_ASSET_DIR),) @@ -125,7 +122,6 @@ ifneq ($(strip $(LOCAL_DROIDDOC_USE_STANDARD_DOCLET)),true) ## droiddoc_templates := \ - $(shell find $(LOCAL_DROIDDOC_TEMPLATE_DIR) -type f) \ $(shell find $(LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR) -type f) droiddoc := \ @@ -135,9 +131,7 @@ droiddoc := \ $(full_target): PRIVATE_DOCLETPATH := $(HOST_OUT_JAVA_LIBRARIES)/jsilver$(COMMON_JAVA_PACKAGE_SUFFIX):$(HOST_OUT_JAVA_LIBRARIES)/doclava$(COMMON_JAVA_PACKAGE_SUFFIX) $(full_target): PRIVATE_CURRENT_BUILD := -hdf page.build $(BUILD_ID)-$(BUILD_NUMBER) $(full_target): PRIVATE_CURRENT_TIME := -hdf page.now "$(shell date "+%d %b %Y %k:%M")" -$(full_target): PRIVATE_TEMPLATE_DIR := $(LOCAL_DROIDDOC_TEMPLATE_DIR) $(full_target): PRIVATE_CUSTOM_TEMPLATE_DIR := $(LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR) -$(full_target): PRIVATE_IN_ASSET_DIR := $(LOCAL_DROIDDOC_TEMPLATE_DIR)/$(LOCAL_DROIDDOC_ASSET_DIR) $(full_target): PRIVATE_IN_CUSTOM_ASSET_DIR := $(LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR)/$(LOCAL_DROIDDOC_CUSTOM_ASSET_DIR) $(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) @@ -166,7 +160,6 @@ $(full_target): $(full_src_files) $(droiddoc_templates) $(droiddoc) $(html_dir_f -doclet com.google.doclava.Doclava \ -docletpath $(PRIVATE_DOCLETPATH) \ -templatedir $(PRIVATE_CUSTOM_TEMPLATE_DIR) \ - -templatedir $(PRIVATE_TEMPLATE_DIR) \ $(PRIVATE_DROIDDOC_HTML_DIR) \ $(addprefix -bootclasspath ,$(PRIVATE_BOOTCLASSPATH)) \ $(addprefix -classpath ,$(PRIVATE_CLASSPATH)) \ @@ -174,12 +167,6 @@ $(full_target): $(full_src_files) $(droiddoc_templates) $(droiddoc) $(html_dir_f -d $(PRIVATE_OUT_DIR) \ $(PRIVATE_CURRENT_BUILD) $(PRIVATE_CURRENT_TIME) \ $(PRIVATE_DROIDDOC_OPTIONS) \ - && rm -rf $(PRIVATE_OUT_ASSET_DIR) \ - && rm -rf $(PRIVATE_OUT_CUSTOM_ASSET_DIR) \ - && mkdir -p $(PRIVATE_OUT_ASSET_DIR) \ - && mkdir -p $(PRIVATE_OUT_CUSTOM_ASSET_DIR) \ - && cp -fr $(PRIVATE_IN_ASSET_DIR)/* $(PRIVATE_OUT_ASSET_DIR)/ \ - && cp -fr $(PRIVATE_IN_CUSTOM_ASSET_DIR)/* $(PRIVATE_OUT_CUSTOM_ASSET_DIR)/ \ && touch -f $@ \ ) || (rm -rf $(PRIVATE_OUT_DIR) $(PRIVATE_SRC_LIST_FILE); exit 45) |