diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-24 00:30:04 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-24 00:30:04 +0000 |
commit | a0e0476c3088685adadbf52c0a24b7a456db4ca9 (patch) | |
tree | 6ae1ed404983672f2b4b33a7f0d2af87c3adc72d | |
parent | d3b8bcfe98f4723af299b6a6acf0dad1e0f21ebf (diff) | |
parent | b953dcc88c303b3b1657f4dcc74167eabf7dd81d (diff) | |
download | soong-a0e0476c3088685adadbf52c0a24b7a456db4ca9.tar.gz |
Snap for 8762204 from 8378feda12bf7153757888bf44ddadc0925c9369 to tm-release am: b953dcc88c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19053906
Change-Id: I8a74ec53a56a101d69bc4e7ea6d6d0ae00d229e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rwxr-xr-x | java/app.go | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/java/app.go b/java/app.go index 94e6fb950..41419ba78 100755 --- a/java/app.go +++ b/java/app.go @@ -589,6 +589,16 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) { a.classLoaderContexts = a.usesLibrary.classLoaderContextForUsesLibDeps(ctx) + var noticeAssetPath android.WritablePath + if Bool(a.appProperties.Embed_notices) || ctx.Config().IsEnvTrue("ALWAYS_EMBED_NOTICES") { + // The rule to create the notice file can't be generated yet, as the final output path + // for the apk isn't known yet. Add the path where the notice file will be generated to the + // aapt rules now before calling aaptBuildActions, the rule to create the notice file will + // be generated later. + noticeAssetPath = android.PathForModuleOut(ctx, "NOTICE", "NOTICE.html.gz") + a.aapt.noticeFile = android.OptionalPathForPath(noticeAssetPath) + } + // Process all building blocks, from AAPT to certificates. a.aaptBuildActions(ctx) @@ -663,7 +673,8 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) { a.extraOutputFiles = append(a.extraOutputFiles, v4SignatureFile) } - if Bool(a.appProperties.Embed_notices) || ctx.Config().IsEnvTrue("ALWAYS_EMBED_NOTICES") { + if a.aapt.noticeFile.Valid() { + // Generating the notice file rule has to be here after a.outputFile is known. noticeFile := android.PathForModuleOut(ctx, "NOTICE.html.gz") android.BuildNoticeHtmlOutputFromLicenseMetadata( ctx, noticeFile, "", "", @@ -672,13 +683,11 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) { android.PathForModuleInstall(ctx).String() + "/", a.outputFile.String(), }) - 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) } for _, split := range a.aapt.splits { |