Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6db86e5f authored by yangbill's avatar yangbill Committed by Bill Yang
Browse files

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
parent 3cb45a5f

cc/androidmk.go

+3 −0
Original line number Diff line number Diff line
@@ -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)