diff options
| author | Sam Mortimer <sam@mortimer.me.uk> | 2018-08-30 15:33:16 -0700 |
|---|---|---|
| committer | Sam Mortimer <sam@mortimer.me.uk> | 2018-09-04 15:58:00 -0700 |
| commit | 7d1b267aa016b78749864b71699bc50923873f9d (patch) | |
| tree | 2288f0d05b5024f7e14f2425e1f9c74e4020f723 | |
| parent | 27806ce6f0f574d79ba0b04f3bb0bc94dce27352 (diff) | |
| download | build_soong-7d1b267aa016b78749864b71699bc50923873f9d.tar.gz build_soong-7d1b267aa016b78749864b71699bc50923873f9d.tar.bz2 build_soong-7d1b267aa016b78749864b71699bc50923873f9d.zip | |
soong: make org.lineage.platform-res depend on framework-res
*) Allows us to build org.lineage.platform-res with no_framework_libs
true (as is done for framework-res).
*) Whilst we're here, undo a dependency loop prevention in aar.go
that we added during sdk bringup to allow our platform res to build
with no_framework_libs false.
Change-Id: Ib452a2e45112baf5d61b70b4be1ce0c01dfd84e5
| -rw-r--r-- | java/aar.go | 2 | ||||
| -rw-r--r-- | java/java.go | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/java/aar.go b/java/aar.go index 5876076d..ca936847 100644 --- a/java/aar.go +++ b/java/aar.go @@ -168,7 +168,7 @@ func (a *aapt) deps(ctx android.BottomUpMutatorContext, sdkVersion string) { if sdkDep.frameworkResModule != "" { ctx.AddDependency(ctx.Module(), frameworkResTag, sdkDep.frameworkResModule) } - if sdkDep.lineageResModule != "" && ctx.ModuleName() != "org.lineageos.platform-res" { + if sdkDep.lineageResModule != "" { ctx.AddDependency(ctx.Module(), lineageResTag, sdkDep.lineageResModule) } } diff --git a/java/java.go b/java/java.go index efa6a7af..a88895cd 100644 --- a/java/java.go +++ b/java/java.go @@ -469,6 +469,9 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) { if ctx.ModuleName() == "framework" { ctx.AddDependency(ctx.Module(), frameworkResTag, "framework-res") } + 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" { ctx.AddDependency(ctx.Module(), lineageResTag, "org.lineageos.platform-res") } |