Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65ad13ae authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

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

* commit '68abe34c':
  Add "-encoding UTF-8" option to javadoc.
parents d21407ea 68abe34c

core/droiddoc.mk

+2 −0
Original line number Diff line number Diff line
@@ -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 \