diff options
| author | Bill Napier <napier@google.com> | 2010-08-27 09:10:42 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-27 09:10:42 -0700 |
| commit | db53e0ef66019566df2fd9ae2f4c3515eaff5d49 (patch) | |
| tree | c18d8dee62db001cd4f7f98850ca92a3931dbdd5 | |
| parent | c3032991983dad7b1dc71a1fc099f0b14df6cfbd (diff) | |
| parent | e7c9178e6f21d652858ade62a7e86125386af110 (diff) | |
| download | frameworks_base-db53e0ef66019566df2fd9ae2f4c3515eaff5d49.zip frameworks_base-db53e0ef66019566df2fd9ae2f4c3515eaff5d49.tar.gz frameworks_base-db53e0ef66019566df2fd9ae2f4c3515eaff5d49.tar.bz2 | |
Merge "Fix MonkeyRunner SDK documentation generation."
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -355,7 +355,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 := \ @@ -522,7 +522,7 @@ $(static_doc_index_redirect): \ $(full_target): $(static_doc_index_redirect) $(full_target): $(framework_built) - +$(full_target): monkeyruner-docs-target # ==== docs for the web (on the google app engine server) ======================= include $(CLEAR_VARS) @@ -550,8 +550,9 @@ LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk include $(BUILD_DROIDDOC) -# explicitly specify that online-sdk depends on framework-res. +# explicitly specify that online-sdk depends on framework-res and any generated docs $(full_target): framework-res-package-target +$(full_target): monkeyruner-docs-target # ==== docs that have all of the stuff that's @hidden ======================= include $(CLEAR_VARS) |