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

Fix breakage: bad path join using '/' literal am: 2a5c090c31 am: cf96d25b3d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2052015

Change-Id: Ied9a569c0941fe2525cbfb448137a6c92940ddf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bob Badour
2022-04-01 09:07:56 +00:00
committed by Automerger Merge Worker
parent cbcf8d9b05 cf96d25b3d
commit ec84245e25
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. // 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) android.BuildNoticeHtmlOutputFromLicenseMetadata(ctx, a.htmlGzNotice)
implicitInputs = append(implicitInputs, a.htmlGzNotice) implicitInputs = append(implicitInputs, a.htmlGzNotice)
optFlags = append(optFlags, "--assets_dir "+filepath.Dir(a.htmlGzNotice.String())) 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) 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) android.BuildNoticeHtmlOutputFromLicenseMetadata(ctx, noticeFile)
if Bool(a.appProperties.Embed_notices) || ctx.Config().IsEnvTrue("ALWAYS_EMBED_NOTICES") { if Bool(a.appProperties.Embed_notices) || ctx.Config().IsEnvTrue("ALWAYS_EMBED_NOTICES") {
a.aapt.noticeFile = android.OptionalPathForPath(noticeFile) a.aapt.noticeFile = android.OptionalPathForPath(noticeFile)