commit 493637cf1c306c41517e550db178c00e70c0a6d1
author Treehugger Robot <treehugger-gerrit@google.com> Thu Nov 15 15:48:55 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 15 15:48:55 2018 +0000
tree a989e1ef610414d4d4032b24b7235afe5902db5a
parent 61d5f9a7c74004c2ad38fab7addb304c126b3353
parent 42308aa1741c559637de40e49c74f3ac12915f5e

Merge "Fix resources in unbundled builds without sdk_version set"

java/aar.go

diff --git a/java/aar.go b/java/aar.go
index a49aef0..99e9136 100644
--- a/java/aar.go
+++ b/java/aar.go
@@ -157,11 +157,9 @@
 }
 
 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)
-		}
+	sdkDep := decodeSdkDep(ctx, sdkContext)
+	if sdkDep.frameworkResModule != "" {
+		ctx.AddVariationDependencies(nil, frameworkResTag, sdkDep.frameworkResModule)
 	}
 }