StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add core-lambda-stubs to classpath

Browse Source 
Add core-lambda-stubs to the bootclasspath for modules with no
sdk_version or with sdk_version: "current", and to the classpath
for modules that specify a specific sdk_version number.  Use the
prebuilt sdk-core-lambda-stubs when using a prebuilt SDK.

Fixes compiling modules with lambdas against the SDK.

This reapplies I5e700f2dd86f1a6b84b7a55dd9bfe21a448d3fb6 with fixes
and tests for unbundled builds.

Bug: 80428539
Test: java_test.go
Change-Id: Ib7aaeebb93137270d7336a7293a08ed7064a3184
This commit is contained in:
Colin Cross
2018-05-29 14:44:55 -07:00
parent 6c2e97364e
commit 86a60ae6fa
5 changed files with 56 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/droiddoc.go
View File

@@ -293,7 +293,7 @@ func (j *Javadoc) addDeps(ctx android.BottomUpMutatorContext) {
ctx.AddDependency(ctx.Module(), libTag, []string{"ext", "framework"}...)
}
} else if sdkDep.useModule {
ctx.AddDependency(ctx.Module(), bootClasspathTag, sdkDep.module)
ctx.AddDependency(ctx.Module(), bootClasspathTag, sdkDep.modules...)
}
}
@@ -377,9 +377,9 @@ func (j *Javadoc) collectDeps(ctx android.ModuleContext) deps {
sdkDep := decodeSdkDep(ctx, String(j.properties.Sdk_version))
if sdkDep.invalidVersion {
ctx.AddMissingDependencies([]string{sdkDep.module})
ctx.AddMissingDependencies(sdkDep.modules)
} else if sdkDep.useFiles {
deps.bootClasspath = append(deps.bootClasspath, sdkDep.jar)
deps.bootClasspath = append(deps.bootClasspath, sdkDep.jars...)
}
ctx.VisitDirectDeps(func(module android.Module) {