diff options
| author | 2022-04-01 02:05:36 +0000 | |
|---|---|---|
| committer | 2022-04-01 14:10:53 +0000 | |
| commit | 77807b3c277723161a193aea2a9df1e464448c3d (patch) | |
| tree | aa4308c05738ee38894901471f83e52c11746ba8 /java/androidmk.go | |
| parent | 2a5c090c31bf6152f9e5954273c06cd34a21092e (diff) | |
Revert "Build notice files from license metadata."
This reverts commit 43c2dcaef609c4a268bfab6c95ed924af4ead6b1.
Reason for revert: suspect build break
Bug: 227682036
Test: TARGET_BUILD_VARIANT=userdebug UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true vendor/google/build/mainline_modules_bundles.sh -j97
Change-Id: Ibfb8b4fefc264f52f32ba661c269a9cd625d800a
Diffstat (limited to 'java/androidmk.go')
| -rw-r--r-- | java/androidmk.go | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index 80b828d45..b930441f3 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -409,6 +409,22 @@ func (app *AndroidApp) AndroidMkEntries() []android.AndroidMkEntries { entries.SetOptionalPaths("LOCAL_SOONG_LINT_REPORTS", app.linter.reports) }, }, + ExtraFooters: []android.AndroidMkExtraFootersFunc{ + func(w io.Writer, name, prefix, moduleDir string) { + if app.noticeOutputs.Merged.Valid() { + fmt.Fprintf(w, "$(call dist-for-goals,%s,%s:%s)\n", + app.installApkName, app.noticeOutputs.Merged.String(), app.installApkName+"_NOTICE") + } + if app.noticeOutputs.TxtOutput.Valid() { + fmt.Fprintf(w, "$(call dist-for-goals,%s,%s:%s)\n", + app.installApkName, app.noticeOutputs.TxtOutput.String(), app.installApkName+"_NOTICE.txt") + } + if app.noticeOutputs.HtmlOutput.Valid() { + fmt.Fprintf(w, "$(call dist-for-goals,%s,%s:%s)\n", + app.installApkName, app.noticeOutputs.HtmlOutput.String(), app.installApkName+"_NOTICE.html") + } + }, + }, }} } |