From d954ea888ab7aac78ca46e73c5ff518122f96ec8 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 8 Nov 2021 11:34:29 -0800 Subject: [PATCH] Add missing dependency from module name to symlinks The rules to install the symlinks had dependencies from PRODUCT_PACKAGES install rules, but from manual install requests like `m toybox`. Add the missing dependencies. Also add the new declare-0p-target licensing call. Fixes: 205524422 Test: m toybox Change-Id: Ie9a5e37b09250aa271ab153a13f41bc34fa4a38a --- core/base_rules.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/base_rules.mk b/core/base_rules.mk index 23a16162dc..300fdda2b3 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -526,6 +526,10 @@ ifneq (,$(LOCAL_SOONG_INSTALLED_MODULE)) # copy of the intermediates for now, as some rules that collect intermediates may expect # them to exist. $(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE) + + $(foreach symlink, $(LOCAL_SOONG_INSTALL_SYMLINKS), \ + $(call declare-0p-target,$(symlink))) + $(my_all_targets) : | $(LOCAL_SOONG_INSTALL_SYMLINKS) else ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) ifneq ($(LOCAL_INSTALLED_MODULE),$(my_default_test_module)) $(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD)