diff options
| author | Ying Wang <wangying@google.com> | 2013-12-10 11:36:18 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-10 11:36:18 -0800 |
| commit | 68abe34c9838993af5c0c6dbc4017c3cd8d7e86c (patch) | |
| tree | 9f95319cb76ab6360f7bbb648ee7e8d6873fe950 /core/droiddoc.mk | |
| parent | e8db5f69d1d06d575ebbe62e6a79ea3b7a077870 (diff) | |
| parent | c2f639a179b3085c7f61a8d71d2ee7b3ff6c9266 (diff) | |
| download | build-68abe34c9838993af5c0c6dbc4017c3cd8d7e86c.zip build-68abe34c9838993af5c0c6dbc4017c3cd8d7e86c.tar.gz build-68abe34c9838993af5c0c6dbc4017c3cd8d7e86c.tar.bz2 | |
am c2f639a1: Merge "Add "-encoding UTF-8" option to javadoc."
* commit 'c2f639a179b3085c7f61a8d71d2ee7b3ff6c9266':
Add "-encoding UTF-8" option to javadoc.
Diffstat (limited to 'core/droiddoc.mk')
| -rw-r--r-- | core/droiddoc.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/droiddoc.mk b/core/droiddoc.mk index fd7f338..93b56d4 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -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 \ |