StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some minor bugs for droiddoc

Browse Source 
1) typo: check-api -> checkapi
2) newlines in the error messages are correctly emitted

Bug: 77575606
Bug: 78034256
Test: m -j checkapi

Change-Id: Ibeef4d9f4f7f2ca48c29c23b1784efa6aa53a364
This commit is contained in:
Jiyong Park
2018-05-12 22:21:20 +09:00
parent 9623892890
commit eeb8a6474c
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/androidmk.go
View File

@@ -292,7 +292,7 @@ func (ddoc *Droiddoc) AndroidMk() android.AndroidMkData {
ddoc.checkCurrentApiTimestamp.String()) ddoc.checkCurrentApiTimestamp.String())
fmt.Fprintln(w, ".PHONY: checkapi") fmt.Fprintln(w, ".PHONY: checkapi")
fmt.Fprintln(w, "check-api:", fmt.Fprintln(w, "checkapi:",
ddoc.checkCurrentApiTimestamp.String()) ddoc.checkCurrentApiTimestamp.String())
fmt.Fprintln(w, ".PHONY: droidcore") fmt.Fprintln(w, ".PHONY: droidcore")

12
java/droiddoc.go
View File

@@ -50,7 +50,7 @@ var (
blueprint.RuleParams{ blueprint.RuleParams{
Command: `( ${config.ApiCheckCmd} -JXmx1024m -J"classpath $classpath" $opts ` + Command: `( ${config.ApiCheckCmd} -JXmx1024m -J"classpath $classpath" $opts ` +
`$apiFile $apiFileToCheck $removedApiFile $removedApiFileToCheck ` + `$apiFile $apiFileToCheck $removedApiFile $removedApiFileToCheck ` +
`&& touch $out ) || (echo $msg ; exit 38)`, `&& touch $out ) || (echo -e "$msg" ; exit 38)`,
CommandDeps: []string{ CommandDeps: []string{
"${config.ApiCheckCmd}", "${config.ApiCheckCmd}",
}, },
@@ -113,10 +113,16 @@ type JavadocProperties struct {
} }
type ApiToCheck struct { type ApiToCheck struct {
// path to the API txt file that the new API extracted from source code is checked
// against. The path can be local to the module or from other module (via :module syntax).
Api_file *string Api_file *string
// path to the API txt file that the new @removed API extractd from source code is
// checked against. The path can be local to the module or from other module (via
// :module syntax).
Removed_api_file *string Removed_api_file *string
// Arguments to the apicheck tool.
Args *string Args *string
} }
@@ -729,9 +735,9 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) {
`To make these errors go away, you have two choices:\n`+ `To make these errors go away, you have two choices:\n`+
` 1. You can add '@hide' javadoc comments to the methods, etc. listed in the\n`+ ` 1. You can add '@hide' javadoc comments to the methods, etc. listed in the\n`+
` errors above.\n\n`+ ` errors above.\n\n`+
` 2. You can update current.txt by executing the following command:`+ ` 2. You can update current.txt by executing the following command:\n`+
` make %s-update-current-api\n\n`+ ` make %s-update-current-api\n\n`+
` To submit the revised current.txt to the main Android repository,`+ ` To submit the revised current.txt to the main Android repository,\n`+
` you will need approval.\n`+ ` you will need approval.\n`+
`******************************\n`, ctx.ModuleName()), `******************************\n`, ctx.ModuleName()),
}, },