diff options
| author | Luca Stefani <luca.stefani.ge1@gmail.com> | 2019-02-04 18:56:52 +0100 |
|---|---|---|
| committer | Luca Stefani <luca.stefani.ge1@gmail.com> | 2019-02-04 19:01:42 +0100 |
| commit | 1c272bea6f81eb5ee0a64df9581262262532ed71 (patch) | |
| tree | 75bb92a2c93bbfb96eabb7a2012395f8cda7a87a | |
| parent | 21bd36e8d170c751a7bee0c91fbaca8f9c435e8c (diff) | |
| download | build_soong-1c272bea6f81eb5ee0a64df9581262262532ed71.tar.gz build_soong-1c272bea6f81eb5ee0a64df9581262262532ed71.tar.bz2 build_soong-1c272bea6f81eb5ee0a64df9581262262532ed71.zip | |
Always link org.lineageos.platform-res for org.lineageos.platform.sdk
Test: m clean && m org.lineageos.platform.sdk
Change-Id: I58956855bd4d1157e2582103c4861e7b384b4f73
| -rw-r--r-- | java/java.go | 7 |
1 files 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) |