commit 9877279855af78a4376a09f022f476d88b406adb
author Jaewoong Jung <jungjw@google.com> Mon Jul 01 17:15:13 2019 -0700
committer Jaewoong Jung <jungjw@google.com> Mon Jul 08 09:26:02 2019 -0700
tree 190b1358d226d08e2ee2aa187ac4284d7a967bfa
parent e65d84c84cca3d7193bce3d410840b72100b9fca

Dist NOTICE outputs for app targets.

Bug: 136501164
Test: m NetworkStack, TreeHugger
Change-Id: I2279eeb0e50b1b5685e23130a8da6ab090f37f56

apex/apex.go

diff --git a/apex/apex.go b/apex/apex.go
index a77e295..ab1ce8b 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -858,8 +858,7 @@
 		return android.OptionalPath{}
 	}
 
-	return android.OptionalPathForPath(
-		android.BuildNoticeOutput(ctx, a.installDir, apexFileName, android.FirstUniquePaths(noticeFiles)))
+	return android.BuildNoticeOutput(ctx, a.installDir, apexFileName, android.FirstUniquePaths(noticeFiles)).HtmlGzOutput
 }
 
 func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext, apexType apexPackaging) {