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

Merge "replace the N Preview landing page with the redirect to the package index also update version metadata (no longer preview, now 7.0)" into nyc-dev

Browse Source
This commit is contained in:
Scott Main
2016-08-31 03:06:08 +00:00
committed by Android (Google) Code Review
parent e245037327 dde8deb950
commit a06f40bd05
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Android.mk
View File

@@ -890,7 +890,7 @@ sample_groups := -samplegroup Admin \
## SDK version identifiers used in the published docs
# major[.minor] version for current SDK. (full releases only)
framework_docs_SDK_VERSION:=6.0
framework_docs_SDK_VERSION:=7.0
# release version (ie "Release x") (full releases only)
framework_docs_SDK_REL_ID:=1
@@ -899,7 +899,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS += \
-hdf sdk.preview.version 5 \
-hdf sdk.version $(framework_docs_SDK_VERSION) \
-hdf sdk.rel.id $(framework_docs_SDK_REL_ID) \
-hdf sdk.preview 1
-hdf sdk.preview 0
# ==== the api stubs and current.xml ===========================
include $(CLEAR_VARS)
@@ -1094,13 +1094,13 @@ LOCAL_DROIDDOC_OPTIONS:=\
-hdf android.whichdoc offline \
-referenceonly
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
include $(BUILD_DROIDDOC)
static_doc_index_redirect := $(out_dir)/index.html
$(static_doc_index_redirect): \
$(LOCAL_PATH)/docs/docs-preview-index.html | $(ACP)
$(LOCAL_PATH)/docs/docs-documentation-redirect.html | $(ACP)
$(hide) mkdir -p $(dir $@)
$(hide) $(ACP) $< $@