Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3d4e07e authored Apr 01, 2022 by Bob Badour Committed by Automerger Merge Worker Apr 01, 2022

Fix breakage: bad path join using '/' literal am: 2a5c090c am: cf96d25b...

Fix breakage: bad path join using '/' literal am: 2a5c090c am: cf96d25b am: ec84245e am: c64d309c am: dc6f626d

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

Change-Id: Icd753c5a5e5ea54a40fa47e79af2e4fedde6e35b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 1e18341e dc6f626d

apex/builder.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -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()))

java/app.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -589,7 +589,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)