StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix breakage: bad path join using '/' literal

Browse Source 
Typo in filename s/b NOTICE.html.gz not NOTICES.html.gz

Bug: 227682036

Test: TARGET_BUILD_VARIANT=userdebug UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true vendor/google/build/mainline_modules_bundles.sh -j97

Change-Id: I75cc28e3ef22d975ad46f4e167071f6d82ba253d
This commit is contained in:
Bob Badour
2022-03-31 22:16:28 -07:00
parent 43c2dcaef6
commit 2a5c090c31
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/builder.go
View File

@@ -617,7 +617,7 @@ 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/NOTICES.html.gz")
a.htmlGzNotice = android.PathForModuleOut(ctx, "NOTICE", "NOTICE.html.gz")
android.BuildNoticeHtmlOutputFromLicenseMetadata(ctx, a.htmlGzNotice)
implicitInputs = append(implicitInputs, a.htmlGzNotice)
optFlags = append(optFlags, "--assets_dir "+filepath.Dir(a.htmlGzNotice.String()))

2
java/app.go
View File

@@ -586,7 +586,7 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) {
}
a.onDeviceDir = android.InstallPathToOnDevicePath(ctx, a.installDir)
noticeFile := android.PathForModuleOut(ctx, "NOTICES.html.gz")
noticeFile := android.PathForModuleOut(ctx, "NOTICE", "NOTICE.html.gz")
android.BuildNoticeHtmlOutputFromLicenseMetadata(ctx, noticeFile)
if Bool(a.appProperties.Embed_notices) || ctx.Config().IsEnvTrue("ALWAYS_EMBED_NOTICES") {
a.aapt.noticeFile = android.OptionalPathForPath(noticeFile)