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

Only add SDK file dependencies on device builds am: 300f038848

Browse Source 
am: f9f641ec91

Change-Id: Id2102ac53c8f019b470174dd2dd3c2a2aed52b19
This commit is contained in:
Colin Cross
2018-03-06 23:38:51 +00:00
committed by android-build-merger
parent 540a0fcb2f f9f641ec91
commit 3ae73c7ee6
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
java/java.go
View File

@@ -571,13 +571,15 @@ func checkLinkType(ctx android.ModuleContext, from *Module, to *Library, tag dep
func (j *Module) collectDeps(ctx android.ModuleContext) deps { func (j *Module) collectDeps(ctx android.ModuleContext) deps {
var deps deps var deps deps
sdkDep := decodeSdkDep(ctx, String(j.deviceProperties.Sdk_version)) if ctx.Device() {
if sdkDep.invalidVersion { sdkDep := decodeSdkDep(ctx, String(j.deviceProperties.Sdk_version))
ctx.AddMissingDependencies([]string{sdkDep.module}) if sdkDep.invalidVersion {
} else if sdkDep.useFiles { ctx.AddMissingDependencies([]string{sdkDep.module})
// sdkDep.jar is actually equivalent to turbine header.jar. } else if sdkDep.useFiles {
deps.classpath = append(deps.classpath, sdkDep.jar) // sdkDep.jar is actually equivalent to turbine header.jar.
deps.aidlIncludeDirs = append(deps.aidlIncludeDirs, sdkDep.aidl) deps.classpath = append(deps.classpath, sdkDep.jar)
deps.aidlIncludeDirs = append(deps.aidlIncludeDirs, sdkDep.aidl)
}
} }
ctx.VisitDirectDeps(func(module android.Module) { ctx.VisitDirectDeps(func(module android.Module) {