commit a53ae43180975b2b0c725ccd33a1d79710ca0a5f
author Pete Gillin <peteg@google.com> Tue Jun 11 11:21:37 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 11 11:21:37 2019 +0000
tree ad04008642eb4e344fedf34fc5ff501204b0b110
parent b879fb6b4b9d3f231503d15878835d9acdd0744e
parent 2b1ea2edb3b4ef7ff86c3f6b9271fddc0ac90926

Merge "Don't specify -encoding twice in Jdiff javadoc invocations."

java/droiddoc.go

diff --git a/java/droiddoc.go b/java/droiddoc.go
index 0ec7799..c4624d8 100644
--- a/java/droiddoc.go
+++ b/java/droiddoc.go
@@ -1751,7 +1751,7 @@
 		jdiff := android.PathForOutput(ctx, "host", ctx.Config().PrebuiltOS(), "framework", "jdiff.jar")
 		jdiffImplicits = append(jdiffImplicits, android.Paths{jdiff, d.apiXmlFile, d.lastReleasedApiXmlFile}...)
 
-		opts := " -encoding UTF-8 -source 1.8 -J-Xmx1600m -XDignore.symbol.file " +
+		opts := " -source 1.8 -J-Xmx1600m -XDignore.symbol.file " +
 			"-doclet jdiff.JDiff -docletpath " + jdiff.String() + " -quiet " +
 			"-newapi " + strings.TrimSuffix(d.apiXmlFile.Base(), d.apiXmlFile.Ext()) +
 			" -newapidir " + filepath.Dir(d.apiXmlFile.String()) +