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

am 834ba474: am 4c6cde54: am 89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs

Browse Source 
* commit '834ba47485a5fb55c89d8f22b826bdb26049f6d6':
  Pass whitelist of sample groups to doclava.
This commit is contained in:
Dirk Dougherty
2013-09-12 09:28:18 -07:00
committed by Android Git Automerger
parent 43c70b0ccf 834ba47485
commit 16dae5997b
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Android.mk
View File

@@ -536,6 +536,13 @@ framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES := \
sample_dir := development/samples sample_dir := development/samples
new_sample_dir := developers/samples/android new_sample_dir := developers/samples/android
# Whitelist of valid groups, used for default TOC grouping. Each sample must
# belong to one (and only one) group. Assign samples to groups by setting
# a sample.group var to one of these groups in the sample's _index.jd.
sample_groups := -samplegroup Input \
-samplegroup Sensors \
-samplegroup Connectivity
# the list here should match the list of samples included in the sdk samples package # the list here should match the list of samples included in the sdk samples package
# (see development/build/sdk.atree) # (see development/build/sdk.atree)
# remove htmlified samples for now -- samples are still available through the SDK # remove htmlified samples for now -- samples are still available through the SDK
@@ -769,7 +776,8 @@ LOCAL_MODULE := online-sdk
LOCAL_DROIDDOC_OPTIONS:= \ LOCAL_DROIDDOC_OPTIONS:= \
$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
-toroot / \ -toroot / \
-hdf android.whichdoc online -hdf android.whichdoc online
# $(sample_groups) \
# $(web_docs_sample_code_flags) # $(web_docs_sample_code_flags)
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk