diff options
| author | Nan Zhang <nanzhang@google.com> | 2018-10-02 16:11:17 -0700 |
|---|---|---|
| committer | Nan Zhang <nanzhang@google.com> | 2018-10-02 16:45:37 -0700 |
| commit | 40b41b4038b24481cab26129ab137e24aba81caf (patch) | |
| tree | 7f0cde46098b35a3eac3f9c4d8ef0a380516c485 /java/droiddoc.go | |
| parent | 946492f005c89ae49ead9869ff12689d2b675143 (diff) | |
| download | android_build_soong-40b41b4038b24481cab26129ab137e24aba81caf.tar.gz android_build_soong-40b41b4038b24481cab26129ab137e24aba81caf.tar.bz2 android_build_soong-40b41b4038b24481cab26129ab137e24aba81caf.zip | |
Use SoongJavacWrapper for javadoc
Test: m -j docs; javac_wrapper_test
Bug: b/116874473
Change-Id: I51d440c815d3db1a0a5dc26ad4e376189dc0aefe
Diffstat (limited to 'java/droiddoc.go')
| -rw-r--r-- | java/droiddoc.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go index bfe72f68..cc2043d0 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -30,7 +30,7 @@ var ( blueprint.RuleParams{ Command: `rm -rf "$outDir" "$srcJarDir" "$stubsDir" && mkdir -p "$outDir" "$srcJarDir" "$stubsDir" && ` + `${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` + - `${config.JavadocCmd} -encoding UTF-8 @$out.rsp @$srcJarDir/list ` + + `${config.SoongJavacWrapper} ${config.JavadocCmd} -encoding UTF-8 @$out.rsp @$srcJarDir/list ` + `$opts $bootclasspathArgs $classpathArgs $sourcepathArgs ` + `-d $outDir -quiet && ` + `${config.SoongZipCmd} -write_if_changed -d -o $docZip -C $outDir -D $outDir && ` + @@ -40,9 +40,10 @@ var ( "${config.JavadocCmd}", "${config.SoongZipCmd}", }, - Rspfile: "$out.rsp", - RspfileContent: "$in", - Restat: true, + CommandOrderOnly: []string{"${config.SoongJavacWrapper}"}, + Rspfile: "$out.rsp", + RspfileContent: "$in", + Restat: true, }, "outDir", "srcJarDir", "stubsDir", "srcJars", "opts", "bootclasspathArgs", "classpathArgs", "sourcepathArgs", "docZip", "postDoclavaCmds") |