diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2009-11-23 13:55:50 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-23 13:55:50 -0800 |
| commit | e0030418fd4b9a9a2d0422a5538a76ca6b40710c (patch) | |
| tree | dd8d08001d1e06896ff3ee1b25a2200c226a0578 /Android.mk | |
| parent | b2796da2ed4d0ef3bd94e187156c3d21e7e2a07f (diff) | |
| parent | bca9f1bbb31cf05ba17af049a5ea37f57981f00e (diff) | |
| download | frameworks_base-e0030418fd4b9a9a2d0422a5538a76ca6b40710c.zip frameworks_base-e0030418fd4b9a9a2d0422a5538a76ca6b40710c.tar.gz frameworks_base-e0030418fd4b9a9a2d0422a5538a76ca6b40710c.tar.bz2 | |
am bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
Merge commit 'bca9f1bbb31cf05ba17af049a5ea37f57981f00e' into eclair-mr2
* commit 'bca9f1bbb31cf05ba17af049a5ea37f57981f00e':
sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -347,6 +347,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ -since ./frameworks/base/api/3.xml 3 \ -since ./frameworks/base/api/4.xml 4 \ -since ./frameworks/base/api/5.xml 5 \ + -since ./frameworks/base/api/6.xml 6 \ -error 1 -error 2 -warning 3 -error 4 -error 6 -error 8 \ -overview $(LOCAL_PATH)/core/java/overview.html @@ -375,7 +376,7 @@ web_docs_sample_code_flags := \ ## SDK version identifiers used in the published docs # major[.minor] version for current SDK. (full releases only) -framework_docs_SDK_VERSION:=2.0 +framework_docs_SDK_VERSION:=2.0.1 # release version (ie "Release x") (full releases only) framework_docs_SDK_REL_ID:=1 # name of current SDK directory (full releases only) @@ -384,10 +385,10 @@ framework_docs_SDK_CURRENT_DIR:=$(framework_docs_SDK_VERSION)_r$(framework_docs_ framework_docs_SDK_PREVIEW:=0 ## Latest ADT version identifiers, for reference from published docs -framework_docs_ADT_VERSION:=0.9.4 -framework_docs_ADT_DOWNLOAD:=ADT-0.9.4.zip -framework_docs_ADT_BYTES:=3367536 -framework_docs_ADT_CHECKSUM:=4cdecd72b3e28022d8a55891f13e7d43 +framework_docs_ADT_VERSION:=0.9.5 +framework_docs_ADT_DOWNLOAD:=ADT-0.9.5.zip +framework_docs_ADT_BYTES:=3372982 +framework_docs_ADT_CHECKSUM:=227ec538359fbe417ccde7f0ad614a96 framework_docs_LOCAL_DROIDDOC_OPTIONS += \ -hdf sdk.version $(framework_docs_SDK_VERSION) \ |