From 6db86e5f0127fb4e445035e59179f2c7d487e7ce Mon Sep 17 00:00:00 2001 From: yangbill Date: Tue, 8 Feb 2022 16:14:25 +0800 Subject: [PATCH] Propagate runtime_libs from Soong to Make Write the list of a module's runtime-required libraries to the `LOCAL_RUNTIME_LIBRARIES` Makefile variable defined for each module. This enables downstream tools to correctly set up the runtime environment for execution. Bug: 215243373 Test: out/soong/Android-aosp_cf_x86_64_phone.mk Change-Id: Ia64a75cfba27af0202973d749d02620b355ec802 --- cc/androidmk.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cc/androidmk.go b/cc/androidmk.go index b56d689d6..715490572 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -108,6 +108,9 @@ func (c *Module) AndroidMkEntries() []android.AndroidMkEntries { if len(c.Properties.AndroidMkHeaderLibs) > 0 { entries.AddStrings("LOCAL_HEADER_LIBRARIES", c.Properties.AndroidMkHeaderLibs...) } + if len(c.Properties.AndroidMkRuntimeLibs) > 0 { + entries.AddStrings("LOCAL_RUNTIME_LIBRARIES", c.Properties.AndroidMkRuntimeLibs...) + } entries.SetString("LOCAL_SOONG_LINK_TYPE", c.makeLinkType) if c.UseVndk() { entries.SetBool("LOCAL_USE_VNDK", true)