am c2f639a1: Merge "Add "-encoding UTF-8" option to javadoc."

* commit 'c2f639a179b3085c7f61a8d71d2ee7b3ff6c9266':
  Add "-encoding UTF-8" option to javadoc.
This commit is contained in:
Ying Wang 2013-12-10 11:36:18 -08:00 committed by Android Git Automerger
commit 68abe34c98
1 changed files with 2 additions and 0 deletions

View File

@ -162,6 +162,7 @@ $(full_target): $(full_src_files) $(droiddoc_templates) $(droiddoc) $(html_dir_f
$(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 @@ $(full_target): $(full_src_files) $(full_java_lib_deps)
$(PRIVATE_SOURCE_INTERMEDIATES_DIR) $(PRIVATE_ADDITIONAL_JAVA_DIR))
$(hide) ( \
javadoc \
-encoding UTF-8 \
$(PRIVATE_DROIDDOC_OPTIONS) \
\@$(PRIVATE_SRC_LIST_FILE) \
-J-Xmx1024m \