From 1c272bea6f81eb5ee0a64df9581262262532ed71 Mon Sep 17 00:00:00 2001 From: Luca Stefani Date: Mon, 4 Feb 2019 18:56:52 +0100 Subject: Always link org.lineageos.platform-res for org.lineageos.platform.sdk Test: m clean && m org.lineageos.platform.sdk Change-Id: I58956855bd4d1157e2582103c4861e7b384b4f73 --- java/java.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/java/java.go b/java/java.go index b1c3c142..f2613b75 100644 --- a/java/java.go +++ b/java/java.go @@ -472,7 +472,9 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) { if ctx.ModuleName() == "org.lineageos.platform-res" { ctx.AddDependency(ctx.Module(), frameworkResTag, "framework-res") } - if ctx.ModuleName() == "org.lineageos.platform" || ctx.ModuleName() == "org.lineageos.platform.internal" { + if ctx.ModuleName() == "org.lineageos.platform" || + ctx.ModuleName() == "org.lineageos.platform.internal" || + ctx.ModuleName() == "org.lineageos.platform.sdk" { ctx.AddDependency(ctx.Module(), lineageResTag, "org.lineageos.platform-res") } } @@ -629,7 +631,8 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps { } case lineageResTag: if ctx.ModuleName() == "org.lineageos.platform" || - ctx.ModuleName() == "org.lineageos.platform.internal" { + ctx.ModuleName() == "org.lineageos.platform.internal" || + ctx.ModuleName() == "org.lineageos.platform.sdk" { // org.lineageos.platform.jar has a one-off dependency on the R.java and Manifest.java files // generated by org.lineageos.platform-res.apk deps.srcJars = append(deps.srcJars, dep.(*AndroidApp).aaptSrcJar) -- cgit v1.2.3