Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 834ba474 authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android Git Automerger
Browse files

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

* commit '4c6cde54':
  Pass whitelist of sample groups to doclava.
parents eacfc308 4c6cde54

Android.mk

+9 −1
Original line number Diff line number Diff line
@@ -469,6 +469,13 @@ framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES := \ 
sample_dir := development/samples

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

# (see development/build/sdk.atree)

# remove htmlified samples for now -- samples are still available through the SDK
@@ -703,6 +710,7 @@ LOCAL_DROIDDOC_OPTIONS:= \ 
		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

		-toroot / \

		-hdf android.whichdoc online

#		$(sample_groups) \

#		$(web_docs_sample_code_flags)



LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk