Merge "Fix strip_prefix flags to strip install paths." am: 20b623da89
am: 28b9607224
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2120624 Change-Id: I5c9edaeb2df8a61eb18fe9368dd2f8e9d1321343 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -665,7 +665,13 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) {
|
||||
|
||||
if Bool(a.appProperties.Embed_notices) || ctx.Config().IsEnvTrue("ALWAYS_EMBED_NOTICES") {
|
||||
noticeFile := android.PathForModuleOut(ctx, "NOTICE.html.gz")
|
||||
android.BuildNoticeHtmlOutputFromLicenseMetadata(ctx, noticeFile, "", "", a.outputFile.String())
|
||||
android.BuildNoticeHtmlOutputFromLicenseMetadata(
|
||||
ctx, noticeFile, "", "",
|
||||
[]string{
|
||||
a.installDir.String() + "/",
|
||||
android.PathForModuleInstall(ctx).String() + "/",
|
||||
a.outputFile.String(),
|
||||
})
|
||||
noticeAssetPath := android.PathForModuleOut(ctx, "NOTICE", "NOTICE.html.gz")
|
||||
builder := android.NewRuleBuilder(pctx, ctx)
|
||||
builder.Command().Text("cp").
|
||||
|
Reference in New Issue
Block a user