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

Commit 8ec17a7b authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Include LICENSE files, when available, in notices." am: 5167fb0a 

Change-Id: Iccf223694b8de22fa0e2d1be2a3dd93e8567fa21
parents 6ebc1806 5167fb0a

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