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

Commit a46de707 authored by Bill Peckham's avatar Bill Peckham
Browse files

Propagate Soong header_libs to module-info.json 

Adding the Soong header_libs dependencies to
module-info.json allows tools to more accurately detect
all module-level dependencies. This change adds
LOCAL_HEADER_LIBRARIES, populated from header_libs, to
the Soong's Android.mk prebulit module definition so
that it will propagate through the prebuilt into
base_rules.mk and eventually to module-info.json.

Bug: 151755703
Test: Find header_libs deps in module-info.json
Change-Id: Ic7134d33fa71822aae548ca097851dc0c1371bad
parent 8df4e08e

cc/androidmk.go

+3 −0
Original line number Diff line number Diff line
@@ -92,6 +92,9 @@ func (c *Module) AndroidMkEntries() []android.AndroidMkEntries { 
				if len(c.Properties.AndroidMkWholeStaticLibs) > 0 {

					entries.AddStrings("LOCAL_WHOLE_STATIC_LIBRARIES", c.Properties.AndroidMkWholeStaticLibs...)

				}

				if len(c.Properties.AndroidMkHeaderLibs) > 0 {

					entries.AddStrings("LOCAL_HEADER_LIBRARIES", c.Properties.AndroidMkHeaderLibs...)

				}

				entries.SetString("LOCAL_SOONG_LINK_TYPE", c.makeLinkType)

				if c.UseVndk() {

					entries.SetBool("LOCAL_USE_VNDK", true)

cc/cc.go

+4 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ type BaseProperties struct { 
	AndroidMkStaticLibs       []string `blueprint:"mutated"`

	AndroidMkRuntimeLibs      []string `blueprint:"mutated"`

	AndroidMkWholeStaticLibs  []string `blueprint:"mutated"`

	AndroidMkHeaderLibs       []string `blueprint:"mutated"`

	HideFromMake              bool     `blueprint:"mutated"`

	PreventInstall            bool     `blueprint:"mutated"`

	ApexesProvidingSharedLibs []string `blueprint:"mutated"`
@@ -2606,6 +2607,9 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps { 
		case wholeStaticDepTag:

			c.Properties.AndroidMkWholeStaticLibs = append(

				c.Properties.AndroidMkWholeStaticLibs, makeLibName(depName))

		case headerDepTag:

			c.Properties.AndroidMkHeaderLibs = append(

				c.Properties.AndroidMkHeaderLibs, makeLibName(depName))

		}

	})