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

Commit 29555d5f authored by Yo Chiang's avatar Yo Chiang
Browse files

APEX should require base module of stub libraries 

Bug: 155841765
Bug: 7456955
Test: m nothing and check the content of out/soong/Android-*.mk
Change-Id: I1f109c27a5e9bcfeb3a887b2e8d6a2cf983aa730
parent 00789cc5

apex/apex.go

+2 −2
Original line number Diff line number Diff line
@@ -2099,8 +2099,8 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
							//

							// Always include if we are a host-apex however since those won't have any

							// system libraries.

							if !android.DirectlyInAnyApex(ctx, cc.Name()) && !android.InList(cc.Name(), a.requiredDeps) {

								a.requiredDeps = append(a.requiredDeps, cc.Name())

							if !android.DirectlyInAnyApex(ctx, cc.Name()) && !android.InList(cc.BaseModuleName(), a.requiredDeps) {

								a.requiredDeps = append(a.requiredDeps, cc.BaseModuleName())

							}

							requireNativeLibs = append(requireNativeLibs, cc.OutputFile().Path().Base())

							// Don't track further