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

Commit 42308aa1 authored by Colin Cross's avatar Colin Cross
Browse files

Fix resources in unbundled builds without sdk_version set 

Unbundled builds can be performed on modules that don't have
sdk_version set if they are in a platform checkout that has
framework-res.  Don't skip calling decodeSdkDep in unbundled
builds.

Bug: 117295826
Test: tapas PackageInstaller && m
Change-Id: I3de093cea05670e0b65e99820c07592973b90b3d
parent 07002e01

java/aar.go

+3 −5
Original line number Diff line number Diff line
@@ -157,13 +157,11 @@ func (a *aapt) aapt2Flags(ctx android.ModuleContext, sdkContext sdkContext, mani 
}



func (a *aapt) deps(ctx android.BottomUpMutatorContext, sdkContext sdkContext) {

	if !ctx.Config().UnbundledBuild() {

	sdkDep := decodeSdkDep(ctx, sdkContext)

	if sdkDep.frameworkResModule != "" {

		ctx.AddVariationDependencies(nil, frameworkResTag, sdkDep.frameworkResModule)

	}

}

}



func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext sdkContext, extraLinkFlags ...string) {

	transitiveStaticLibs, staticLibManifests, libDeps, libFlags := aaptLibs(ctx, sdkContext)