am bf142e6b: am 16dae599: am 834ba474: am 4c6cde54: am 89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs
* commit 'bf142e6b846d86d4dcf75a51cfb84c2495291bae':
Pass whitelist of sample groups to doclava.
diff --git a/Android.mk b/Android.mk
index 2e8e1fd..e349d96 100644
--- a/Android.mk
+++ b/Android.mk
@@ -536,6 +536,13 @@
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
@@ -769,7 +776,8 @@
LOCAL_DROIDDOC_OPTIONS:= \
$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
-toroot / \
- -hdf android.whichdoc online
+ -hdf android.whichdoc online
+# $(sample_groups) \
# $(web_docs_sample_code_flags)
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk