summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dirk Dougherty <ddougherty@google.com> 2013-11-23 12:31:18 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2013-11-23 12:31:18 -0800
commit713e3853bf57410f389496c20db1fc3818b3d5d8 (patch)
treec4c4272257bccc638840822eb4b6bcdbac699e19
parent57c33d0d71251d408cf771e5fa861fb1cdecf5f9 (diff)
parent0b492138c744299e695b6aeee24eebb880de1c7d (diff)
am 0b492138: am 6000f1ed: Re-enable samples browser.
* commit '0b492138c744299e695b6aeee24eebb880de1c7d': Re-enable samples browser.
-rw-r--r--Android.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index b0bc8a298c67..24091f1e91ba 100644
--- a/Android.mk
+++ b/Android.mk
@@ -685,10 +685,10 @@ LOCAL_MODULE := online-sdk
LOCAL_DROIDDOC_OPTIONS:= \
$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
-toroot / \
- -hdf android.whichdoc online
-# $(sample_groups) \
-# -hdf android.hasSamples true \
-# -samplesdir $(samples_dir)
+ -hdf android.whichdoc online \
+ $(sample_groups) \
+ -hdf android.hasSamples true \
+ -samplesdir $(samples_dir)
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk