commit 5167fb0a37957442c9bf8fd54625fec1dc7d008d
author Bob Badour <bbadour@google.com> Thu Feb 27 23:29:26 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 27 23:29:26 2020 +0000
tree f4d734cacbb5887fa39badeddc4a53be49de130e
parent 04c90d44f783d0f0b5397486c318f34454fc6692
parent 9da828c1b4ac7c67637a2b082184c5ebcdcd1995

Merge "Include LICENSE files, when available, in notices."

core/notice_files.mk

diff --git a/core/notice_files.mk b/core/notice_files.mk
index 9df1c11..77fb8d4 100644
--- a/core/notice_files.mk
+++ b/core/notice_files.mk
@@ -6,7 +6,7 @@
 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): $(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