From eeb8a6474c83327fb495d7ef4cf4b51f3f55a495 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Sat, 12 May 2018 22:21:20 +0900
Subject: [PATCH] Fix some minor bugs for droiddoc

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
---
 java/androidmk.go |  2 +-
 java/droiddoc.go  | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/java/androidmk.go b/java/androidmk.go
index 5a4a082b4..88dc6ef3d 100644
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -292,7 +292,7 @@ func (ddoc *Droiddoc) AndroidMk() android.AndroidMkData {
 						ddoc.checkCurrentApiTimestamp.String())
 
 					fmt.Fprintln(w, ".PHONY: checkapi")
-					fmt.Fprintln(w, "check-api:",
+					fmt.Fprintln(w, "checkapi:",
 						ddoc.checkCurrentApiTimestamp.String())
 
 					fmt.Fprintln(w, ".PHONY: droidcore")
diff --git a/java/droiddoc.go b/java/droiddoc.go
index 202f22bc8..b34c39367 100644
--- a/java/droiddoc.go
+++ b/java/droiddoc.go
@@ -50,7 +50,7 @@ var (
 		blueprint.RuleParams{
 			Command: `( ${config.ApiCheckCmd} -JXmx1024m -J"classpath $classpath" $opts ` +
 				`$apiFile $apiFileToCheck $removedApiFile $removedApiFileToCheck ` +
-				`&& touch $out ) || (echo $msg ; exit 38)`,
+				`&& touch $out ) || (echo -e "$msg" ; exit 38)`,
 			CommandDeps: []string{
 				"${config.ApiCheckCmd}",
 			},
@@ -113,10 +113,16 @@ type JavadocProperties 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
 
+	// 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
 
+	// Arguments to the apicheck tool.
 	Args *string
 }
 
@@ -729,9 +735,9 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 					`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`+
 					`      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`+
-					`      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`+
 					`******************************\n`, ctx.ModuleName()),
 			},