summaryrefslogtreecommitdiff
path: root/apex/builder.go
diff options
context:
space:
mode:
author Bob Badour <bbadour@google.com> 2022-06-08 15:59:35 -0700
committer Bob Badour <bbadour@google.com> 2022-06-09 14:24:41 -0700
commitc6ec9fb849aa8d459c9571d2262bf8667a90c148 (patch)
tree4c3f8f04f324156cf0f33f396e8ace6be1663701 /apex/builder.go
parent0d364eead59476cd1da44e19115a33e7eaaf6878 (diff)
Fix strip_prefix flags to strip install paths.
Bug: 235331488 Test: m droid dist Change-Id: I3cd2af5d90e46a4c983728bc9b2d941d6ffda229
Diffstat (limited to 'apex/builder.go')
-rw-r--r--apex/builder.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/apex/builder.go b/apex/builder.go
index 91193637c..a21fcb899 100644
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -618,7 +618,12 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
// Create a NOTICE file, and embed it as an asset file in the APEX.
a.htmlGzNotice = android.PathForModuleOut(ctx, "NOTICE.html.gz")
- android.BuildNoticeHtmlOutputFromLicenseMetadata(ctx, a.htmlGzNotice, "", "", unsignedOutputFile.String())
+ android.BuildNoticeHtmlOutputFromLicenseMetadata(
+ ctx, a.htmlGzNotice, "", "",
+ []string{
+ android.PathForModuleInstall(ctx).String() + "/",
+ android.PathForModuleInPartitionInstall(ctx, "apex").String() + "/",
+ })
noticeAssetPath := android.PathForModuleOut(ctx, "NOTICE", "NOTICE.html.gz")
builder := android.NewRuleBuilder(pctx, ctx)
builder.Command().Text("cp").