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

Commit 4297f40b authored by Colin Cross's avatar Colin Cross
Browse files

Remove ApexesProvidingSharedLibs 

ApexesProvidingSharedLibs requires reading from InApexVariants, which
is being removed, and ApexesProvidingSharedLibs is not currently used.

Bug: 372543712
Test: builds
Change-Id: I366879d265d62e1cb7eea1cadefb4b4c6981d2ba
parent 2dcbca69

cc/cc.go

+8 −21
Original line number Diff line number Diff line
@@ -349,7 +349,6 @@ type BaseProperties struct { 
	AndroidMkHeaderLibs      []string `blueprint:"mutated"`

	HideFromMake             bool     `blueprint:"mutated"`

	PreventInstall           bool     `blueprint:"mutated"`

	ApexesProvidingSharedLibs []string `blueprint:"mutated"`



	// Set by DepsMutator.

	AndroidMkSystemSharedLibs []string `blueprint:"mutated"`
@@ -3285,18 +3284,6 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps { 
				c.Properties.AndroidMkHeaderLibs = append(

					c.Properties.AndroidMkHeaderLibs, makeLibName)

			case libDepTag.shared():

				if lib := moduleLibraryInterface(dep); lib != nil {

					if lib.buildStubs() && dep.(android.ApexModule).InAnyApex() {

						// Add the dependency to the APEX(es) providing the library so that

						// m <module> can trigger building the APEXes as well.

						depApexInfo, _ := android.OtherModuleProvider(ctx, dep, android.ApexInfoProvider)

						for _, an := range depApexInfo.InApexVariants {

							c.Properties.ApexesProvidingSharedLibs = append(

								c.Properties.ApexesProvidingSharedLibs, an)

						}

					}

				}



				// Note: the order of libs in this list is not important because

				// they merely serve as Make dependencies and do not affect this lib itself.

				c.Properties.AndroidMkSharedLibs = append(