am 077ed54e: am 65ad13ae: am 68abe34c: am c2f639a1: Merge "Add "-encoding UTF-8" option to javadoc."

* commit '077ed54e14577ef0d034e29d9cd3a611ee622dfe':
  Add "-encoding UTF-8" option to javadoc.
This commit is contained in:
Ying Wang
2013-12-10 19:42:55 +00:00
committed by Android Git Automerger

View File

@@ -157,6 +157,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) \
@@ -190,6 +191,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 \