commit 20fc1b3719a1bbd2e5f112c2250eccd11698f47d
author Bob Badour <bbadour@google.com> Wed Jul 29 13:40:16 2020 -0700
committer Bob Badour <bbadour@google.com> Tue Jan 05 08:42:48 2021 -0800
tree a95924014d2a81fcf499f4c4a6f60b5b90111156
parent 6421674a393c36c815968f548c6cc06148faab9e

Rough-in license metadata support to make.

Change-Id: Icaff40171b94538219a8caa697b182dbdcc8229a

core/notice_files.mk

diff --git a/core/notice_files.mk b/core/notice_files.mk
index d385bbc..89f822b 100644
--- a/core/notice_files.mk
+++ b/core/notice_files.mk
@@ -167,8 +167,6 @@
       # Soong produces uninstallable *.sdk shared libraries for embedding in APKs.
       module_installed_filename := \
           $(patsubst $(PRODUCT_OUT)/%,%,$($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_SHARED_LIBRARIES))/$(notdir $(LOCAL_BUILT_MODULE))
-    else
-      $(error Cannot determine where to install NOTICE file for $(LOCAL_MODULE))
     endif # JAVA_LIBRARIES
   endif # STATIC_LIBRARIES
 endif
@@ -186,11 +184,12 @@
 endif
 
 $(installed_notice_file): PRIVATE_INSTALLED_MODULE := $(module_installed_filename)
+$(installed_notice_file) : PRIVATE_NOTICES := $(notice_file)
 
 $(installed_notice_file): $(notice_file)
 	@echo Notice file: $< -- $@
 	$(hide) mkdir -p $(dir $@)
-	$(hide) awk 'FNR==1 && NR > 1 {print "\n"} {print}' $^ > $@
+	$(hide) awk 'FNR==1 && NR > 1 {print "\n"} {print}' $(PRIVATE_NOTICES) > $@
 
 ifdef LOCAL_INSTALLED_MODULE
 # Make LOCAL_INSTALLED_MODULE depend on NOTICE files if they exist