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

Commit c7f2125a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Keep dependency files out of the apk file." am: 5f58c378 am: d4a37e07 am: f82be535 

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



Change-Id: Ifdaf251cae92a6cb38f338e1455390fea84fc5df
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ba1f73d2 f82be535

apex/builder.go

+9 −3
Original line number Diff line number Diff line
@@ -617,10 +617,16 @@ 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", "NOTICE.html.gz")

		a.htmlGzNotice = android.PathForModuleOut(ctx, "NOTICE.html.gz")

		android.BuildNoticeHtmlOutputFromLicenseMetadata(ctx, a.htmlGzNotice)

		implicitInputs = append(implicitInputs, a.htmlGzNotice)

		optFlags = append(optFlags, "--assets_dir "+filepath.Dir(a.htmlGzNotice.String()))

		noticeAssetPath := android.PathForModuleOut(ctx, "NOTICE", "NOTICE.html.gz")

		builder := android.NewRuleBuilder(pctx, ctx)

		builder.Command().Text("cp").

			Input(a.htmlGzNotice).

			Output(noticeAssetPath)

		builder.Build("notice_dir", "Building notice dir")

		implicitInputs = append(implicitInputs, noticeAssetPath)

		optFlags = append(optFlags, "--assets_dir "+filepath.Dir(noticeAssetPath.String()))



		if (moduleMinSdkVersion.GreaterThan(android.SdkVersion_Android10) && !a.shouldGenerateHashtree()) && !compressionEnabled {

			// Apexes which are supposed to be installed in builtin dirs(/system, etc)

java/app.go

+9 −3
Original line number Diff line number Diff line
@@ -589,10 +589,16 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) { 
	}

	a.onDeviceDir = android.InstallPathToOnDevicePath(ctx, a.installDir)



	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)

		noticeFile := android.PathForModuleOut(ctx, "NOTICE.html.gz")

		android.BuildNoticeHtmlOutputFromLicenseMetadata(ctx, noticeFile)

		noticeAssetPath := android.PathForModuleOut(ctx, "NOTICE", "NOTICE.html.gz")

		builder := android.NewRuleBuilder(pctx, ctx)

		builder.Command().Text("cp").

			Input(noticeFile).

			Output(noticeAssetPath)

		builder.Build("notice_dir", "Building notice dir")

		a.aapt.noticeFile = android.OptionalPathForPath(noticeAssetPath)

	}



	a.classLoaderContexts = a.usesLibrary.classLoaderContextForUsesLibDeps(ctx)