diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-09-16 11:32:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 11:32:30 -0700 |
| commit | 40da25a26e259ebb1bede1db076480d3817ac4c3 (patch) | |
| tree | 62df6afbf6f30a53bbf0777364e308ccdc155b61 /Android.mk | |
| parent | b27d07cccf2dbd34e486f6ae5cfdf361e6437162 (diff) | |
| parent | 8ee9ecc145c9e05faf13f4bcf5853c888760c1b6 (diff) | |
| download | frameworks_base-40da25a26e259ebb1bede1db076480d3817ac4c3.zip frameworks_base-40da25a26e259ebb1bede1db076480d3817ac4c3.tar.gz frameworks_base-40da25a26e259ebb1bede1db076480d3817ac4c3.tar.bz2 | |
am 8ee9ecc1: am 9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread
Merge commit '8ee9ecc145c9e05faf13f4bcf5853c888760c1b6'
* commit '8ee9ecc145c9e05faf13f4bcf5853c888760c1b6':
Doc change: clean up droiddoc (cs) macros.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 17 |
1 files changed, 2 insertions, 15 deletions
@@ -435,25 +435,12 @@ web_docs_sample_code_flags := \ framework_docs_SDK_VERSION:=2.2 # release version (ie "Release x") (full releases only) framework_docs_SDK_REL_ID:=1 - # name of current SDK directory (full releases only) -framework_docs_SDK_CURRENT_DIR:=$(framework_docs_SDK_VERSION)_r$(framework_docs_SDK_REL_ID) # flag to build offline docs for a preview release framework_docs_SDK_PREVIEW:=0 -## Latest ADT version identifiers, for reference from published docs -framework_docs_ADT_VERSION:=0.9.8 -framework_docs_ADT_DOWNLOAD:=ADT-0.9.8.zip -framework_docs_ADT_BYTES:=8301417 -framework_docs_ADT_CHECKSUM:=27e0de800512f13feae46fb554e6ee2f - framework_docs_LOCAL_DROIDDOC_OPTIONS += \ -hdf sdk.version $(framework_docs_SDK_VERSION) \ - -hdf sdk.rel.id $(framework_docs_SDK_REL_ID) \ - -hdf sdk.current $(framework_docs_SDK_CURRENT_DIR) \ - -hdf adt.zip.version $(framework_docs_ADT_VERSION) \ - -hdf adt.zip.download $(framework_docs_ADT_DOWNLOAD) \ - -hdf adt.zip.bytes $(framework_docs_ADT_BYTES) \ - -hdf adt.zip.checksum $(framework_docs_ADT_CHECKSUM) + -hdf sdk.rel.id $(framework_docs_SDK_REL_ID) # ==== the api stubs and current.xml =========================== include $(CLEAR_VARS) @@ -540,7 +527,7 @@ LOCAL_DROIDDOC_OPTIONS:=\ -hdf android.whichdoc offline ifeq ($(framework_docs_SDK_PREVIEW),true) - LOCAL_DROIDDOC_OPTIONS += -hdf sdk.current preview + LOCAL_DROIDDOC_OPTIONS += -hdf sdk.preview true endif LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk |