diff options
| author | 2022-04-02 01:05:50 +0000 | |
|---|---|---|
| committer | 2022-04-02 01:05:50 +0000 | |
| commit | b0489dec232b9656830d5910cc7f270111f6fd4c (patch) | |
| tree | 0f6db3709f29be934ef5f9b226d531d6fecb54d7 /java/androidmk.go | |
| parent | f4d7122237cce6df342b512910513880dfef02ae (diff) | |
| parent | 3aae38d451e44d7f12224e938456dfb2fd665ac5 (diff) | |
Merge "Revert "Revert "Build notice files from license metadata.""" am: 3aae38d451
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2051564
Change-Id: I3f2bafea9462d6a6b15bf29884ba64e2353b0627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/androidmk.go')
| -rw-r--r-- | java/androidmk.go | 16 |
1 files changed, 0 insertions, 16 deletions
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") - } - }, - }, }} } |