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

Commit 6345dfde authored by Yo Chiang's avatar Yo Chiang Committed by Gerrit Code Review
Browse files

Merge "APEX should require base module of stub libraries"

parents 97486dbb 29555d5f

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