commit 34e3e170e4f9c2f5e4bf7721de8562b189c3c16b
author Ying Wang <wangying@google.com> Tue Dec 10 11:29:25 2013 -0800
committer Ying Wang <wangying@google.com> Tue Dec 10 11:30:01 2013 -0800
tree aa9ea40fe3251918f943920004fab91e01aaf458
parent 99bb0365d53186c8ece6ac4e61ca2d303d0e0f0a

Add "-encoding UTF-8" option to javadoc.

This fixed docs build on Mac OS X 10.9 with Java 7.
Change-Id: I91e224456c9e6c43dbf13d691c3b37d21f94b0f3

core/droiddoc.mk

diff --git a/core/droiddoc.mk b/core/droiddoc.mk
index 0d3094d..f528ee0 100644
--- a/core/droiddoc.mk
+++ b/core/droiddoc.mk
@@ -162,6 +162,7 @@
 			$(PRIVATE_SOURCE_INTERMEDIATES_DIR) $(PRIVATE_ADDITIONAL_JAVA_DIR))
 	$(hide) ( \
 		javadoc \
+                -encoding UTF-8 \
                 \@$(PRIVATE_SRC_LIST_FILE) \
                 -J-Xmx1280m \
                 $(PRIVATE_PROFILING_OPTIONS) \
@@ -195,6 +196,7 @@
 			$(PRIVATE_SOURCE_INTERMEDIATES_DIR) $(PRIVATE_ADDITIONAL_JAVA_DIR))
 	$(hide) ( \
 		javadoc \
+                -encoding UTF-8 \
                 $(PRIVATE_DROIDDOC_OPTIONS) \
                 \@$(PRIVATE_SRC_LIST_FILE) \
                 -J-Xmx1024m \