Revert^2 "Rough-in license metadata support to make."
Changed shell script to /bin/sh syntax for portability to mac_os etc.
54066744f05a335bb04851398ad267c8d311128c
Change-Id: Ibd472fc1bedfdc228a704108f0280b13ab1c9333
diff --git a/core/main.mk b/core/main.mk
index 4710f7a..fb13093 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1404,8 +1404,16 @@
ALL_DEFAULT_INSTALLED_MODULES :=
+# Some notice deps refer to module names without prefix or arch suffix where
+# only the variants with them get built.
+# fix-notice-deps replaces those unadorned module names with every built variant.
$(call fix-notice-deps)
+# Create a license metadata rule per module. Could happen in base_rules.mk or
+# notice_files.mk; except, it has to happen after fix-notice-deps to avoid
+# missing dependency errors.
+$(call build-license-metadata)
+
# These are additional goals that we build, in order to make sure that there
# is as little code as possible in the tree that doesn't build.