Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am bfc9325f: Merge "Add support for generated documentation as part of the SDK docs." into gingerbread

Browse Source 
Merge commit 'bfc9325f8981173db51bc46af0e762dad1341671' into gingerbread-plus-aosp

* commit 'bfc9325f8981173db51bc46af0e762dad1341671':
  Add support for generated documentation as part of the SDK docs.
This commit is contained in:
Rohit Mungee
2010-08-24 23:03:32 -07:00
committed by Android Git Automerger
parent 1922ac108c bfc9325f89
commit 2251894743
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Android.mk
View File

@@ -348,7 +348,7 @@ framework_docs_LOCAL_JAVA_LIBRARIES := \
framework \
framework_docs_LOCAL_MODULE_CLASS := JAVA_LIBRARIES
framework_docs_LOCAL_DROIDDOC_HTML_DIR := docs/html
framework_docs_LOCAL_DROIDDOC_HTML_DIR := $(LOCAL_PATH)/docs/html $(OUT_DOCS)/gen
# The since flag (-since N.xml API_LEVEL) is used to add API Level information
# to the reference documentation. Must be in order of oldest to newest.
framework_docs_LOCAL_DROIDDOC_OPTIONS := \
@@ -539,8 +539,8 @@ LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk
include $(BUILD_DROIDDOC)
# explicitly specify that online-sdk depends on framework-res.
$(full_target): framework-res-package-target
# explicitly specify that online-sdk depends on framework-res and any generated docs
$(full_target): framework-res-package-target $(ALL_GENERATED_DOCS)
# ==== docs that have all of the stuff that's @hidden =======================
include $(CLEAR_VARS)