Revert "Temporarily disable docs while we debug some uncooperative product types"
This reverts commit 203e0ba99003c4a0a0ef727e30f2ca5c5bcb98fd.
Bug: 20491556
Bug: 22729459
Bug: 22609583
Change-Id: I23ac5b42319cefa027ac0014d2c5e78dd95d6317
diff --git a/Android.mk b/Android.mk
index 633e4a1..085eae3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -47,23 +47,21 @@
# Enable the build process to generate javadoc
# We need to reference symbols in the jar built above.
+LOCAL_JAVA_LIBRARIES += tradefed
+LOCAL_IS_HOST_MODULE:=true
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_ADDITIONAL_DEPENDENCIES := tradefed
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sac
+LOCAL_DROIDDOC_OPTIONS:= \
+ -package \
+ -toroot / \
+ -hdf android.whichdoc online \
+ -hdf sac true \
+ -hdf devices true \
+ -showAnnotation com.android.tradefed.config.OptionClass \
+ -showAnnotation com.android.tradefed.config.Option \
-### temporarily disable docs builds until they build across all product types
-### LOCAL_JAVA_LIBRARIES += tradefed
-### LOCAL_IS_HOST_MODULE:=true
-### LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-### LOCAL_ADDITIONAL_DEPENDENCIES := tradefed
-### LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sac
-### LOCAL_DROIDDOC_OPTIONS:= \
-### -package \
-### -toroot / \
-### -hdf android.whichdoc online \
-### -hdf sac true \
-### -hdf devices true \
-### -showAnnotation com.android.tradefed.config.OptionClass \
-### -showAnnotation com.android.tradefed.config.Option \
-###
-### include $(BUILD_DROIDDOC)
+include $(BUILD_DROIDDOC)
#######################################################
include $(CLEAR_VARS)
