From 2a5c090c31bf6152f9e5954273c06cd34a21092e Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Thu, 31 Mar 2022 22:16:28 -0700 Subject: [PATCH] Fix breakage: bad path join using '/' literal 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 --- apex/builder.go | 2 +- java/app.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apex/builder.go b/apex/builder.go index 5d5d1abec..50c8dd122 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -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())) diff --git a/java/app.go b/java/app.go index 573b9ecaa..5b1daa412 100755 --- a/java/app.go +++ b/java/app.go @@ -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)