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

Merge changes Ib7ad715d,I3a83b5ed am: 7d9deed9fd am: 5befecfe64

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353932

Change-Id: Ic5de5a55a939f2a1ae8ce922c31e52b6f7c443e3
This commit is contained in:
Treehugger Robot
2020-07-01 17:51:31 +00:00
committed by Automerger Merge Worker
parent d756fc76d1 5befecfe64
commit 12d1bde698
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/droiddoc.go
View File

@@ -440,16 +440,11 @@ func (j *Javadoc) targetSdkVersion() sdkSpec {
func (j *Javadoc) addDeps(ctx android.BottomUpMutatorContext) {
if ctx.Device() {
sdkDep := decodeSdkDep(ctx, sdkContext(j))
if sdkDep.useDefaultLibs {
ctx.AddVariationDependencies(nil, bootClasspathTag, config.LegacyCorePlatformBootclasspathLibraries...)
ctx.AddVariationDependencies(nil, systemModulesTag, config.LegacyCorePlatformSystemModules)
if sdkDep.hasFrameworkLibs() {
ctx.AddVariationDependencies(nil, libTag, config.FrameworkLibraries...)
}
} else if sdkDep.useModule {
if sdkDep.useModule {
ctx.AddVariationDependencies(nil, bootClasspathTag, sdkDep.bootclasspath...)
ctx.AddVariationDependencies(nil, systemModulesTag, sdkDep.systemModules)
ctx.AddVariationDependencies(nil, java9LibTag, sdkDep.java9Classpath...)
ctx.AddVariationDependencies(nil, libTag, sdkDep.classpath...)
}
}