diff options
| author | Rohit Mungee <rohitm@google.com> | 2010-08-24 23:15:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 23:15:28 -0700 |
| commit | 6615759f0c3074b8f3285bfdf0ecf9d38c45d46d (patch) | |
| tree | a49011252ede41b42a139234e43d5702c47cfc83 /Android.mk | |
| parent | a0b436234d999a05b1ddb571dea3956ad5139a4c (diff) | |
| parent | 2251894743f9e7b1ca7f546369c2ba7fc3d28e1f (diff) | |
| download | frameworks_base-6615759f0c3074b8f3285bfdf0ecf9d38c45d46d.zip frameworks_base-6615759f0c3074b8f3285bfdf0ecf9d38c45d46d.tar.gz frameworks_base-6615759f0c3074b8f3285bfdf0ecf9d38c45d46d.tar.bz2 | |
am 22518947: am bfc9325f: Merge "Add support for generated documentation as part of the SDK docs." into gingerbread
Merge commit '2251894743f9e7b1ca7f546369c2ba7fc3d28e1f'
* commit '2251894743f9e7b1ca7f546369c2ba7fc3d28e1f':
Add support for generated documentation as part of the SDK docs.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 3 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 := \ @@ -550,8 +550,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) |