Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9da828c1 authored by Bob Badour's avatar Bob Badour
Browse files

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
parent 684350d2

core/notice_files.mk

+2 −2
Original line number Diff line number Diff line
@@ -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