diff options
| author | Bob Badour <bbadour@google.com> | 2020-02-13 12:37:33 -0800 |
|---|---|---|
| committer | Bob Badour <bbadour@google.com> | 2020-02-27 19:19:23 +0000 |
| commit | 9da828c1b4ac7c67637a2b082184c5ebcdcd1995 (patch) | |
| tree | 987074d5a961e9c457c25f3ddd8fc2fbb50cf8d5 | |
| parent | 684350d24f96f38dfcfb30fcc9b0b96f44231245 (diff) | |
| download | build-9da828c1b4ac7c67637a2b082184c5ebcdcd1995.tar.gz | |
Include LICENSE files, when available, in notices.
As a first step to removing the go/android3p instructions to copy or
to link NOTICE to LICENSE, include LICENSE files in the notices, which
will allow deleting all of the copied/linked NOTICE files.
The change causes a couple minor additions to the system image notice
files.
Test: manually built and compared before and after notices
Change-Id: Id23cae4a8f2d103e1379f4341340fc56c5943dc2
| -rw-r--r-- | core/notice_files.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/notice_files.mk b/core/notice_files.mk index 9df1c1125a..77fb8d461b 100644 --- a/core/notice_files.mk +++ b/core/notice_files.mk @@ -6,7 +6,7 @@ $(call record-module-type,NOTICE_FILE) ifneq ($(LOCAL_NOTICE_FILE),) notice_file:=$(strip $(LOCAL_NOTICE_FILE)) else -notice_file:=$(strip $(wildcard $(LOCAL_PATH)/NOTICE)) +notice_file:=$(strip $(wildcard $(LOCAL_PATH)/LICENSE $(LOCAL_PATH)/LICENCE $(LOCAL_PATH)/NOTICE)) endif ifeq ($(LOCAL_MODULE_CLASS),GYP) @@ -101,7 +101,7 @@ $(installed_notice_file): PRIVATE_INSTALLED_MODULE := $(module_installed_filenam $(installed_notice_file): $(notice_file) @echo Notice file: $< -- $@ $(hide) mkdir -p $(dir $@) - $(hide) cat $< > $@ + $(hide) awk 'FNR==1 && NR > 1 {print "\n"} {print}' $^ > $@ ifdef LOCAL_INSTALLED_MODULE # Make LOCAL_INSTALLED_MODULE depend on NOTICE files if they exist |