Merge "Add jdiff support for Soong"

am: fd20eade07 Change-Id: I39d6fb389814b545b86dd2994092c2cddc1a34d1
2018-09-18 22:05:28 -07:00
parent 9078d2c871 fd20eade07
commit 9ca4274e1c
2 changed files with 104 additions and 11 deletions
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -400,6 +400,9 @@ func (dstubs *Droidstubs) AndroidMk() android.AndroidMkData {
 				if dstubs.annotationsZip != nil {
 					fmt.Fprintln(w, "LOCAL_DROIDDOC_ANNOTATIONS_ZIP := ", dstubs.annotationsZip.String())
 				}
+				if dstubs.jdiffDocZip != nil {
+					fmt.Fprintln(w, "LOCAL_DROIDDOC_JDIFF_DOC_ZIP := ", dstubs.jdiffDocZip.String())
+				}
 				if dstubs.checkCurrentApiTimestamp != nil {
 					fmt.Fprintln(w, ".PHONY:", dstubs.Name()+"-check-current-api")
 					fmt.Fprintln(w, dstubs.Name()+"-check-current-api:",