Merge "Fix resources in unbundled builds without sdk_version set" (493637cf) · Commits · e / os / android_build_soong

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)