From de6a087d2d289bf01097c152a349a33ea8fa91f8 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 1 Apr 2022 18:00:00 +0000 Subject: Revert "Revert "Build notice files from license metadata."" This reverts commit 77807b3c277723161a193aea2a9df1e464448c3d. Reason for revert: fix and roll forward again Change-Id: I80c796ca81ecf29df9522babe54d684a0d11b9e6 --- java/androidmk.go | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'java/androidmk.go') diff --git a/java/androidmk.go b/java/androidmk.go index b930441f3..80b828d45 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -409,22 +409,6 @@ 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") - } - }, - }, }} } -- cgit v1.2.3-59-g8ed1b