diff options
| author | 2017-09-26 01:12:30 +0000 | |
|---|---|---|
| committer | 2017-09-26 01:12:30 +0000 | |
| commit | 3bea186bc5ee60b36a5b2377c47c0895a8dc8c8c (patch) | |
| tree | cc54e734b57b1a519f76af2b7be3a19b0638bfa2 /java/java.go | |
| parent | fdb573147e4deff1a06c4aa6839c43f42865f138 (diff) | |
| parent | cb2c92961c7217ac2bdd6bbd94849b087cb2fbc9 (diff) | |
Merge "Remove duplication of bootclasspath in DefaultLibraries"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index 43f97acda..5e063a527 100644 --- a/java/java.go +++ b/java/java.go @@ -258,7 +258,7 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) { if ctx.Device() { sdkDep := decodeSdkDep(ctx, j.deviceProperties.Sdk_version) if sdkDep.useDefaultLibs { - ctx.AddDependency(ctx.Module(), bootClasspathTag, "core-oj", "core-libart") + ctx.AddDependency(ctx.Module(), bootClasspathTag, config.DefaultBootclasspathLibraries...) ctx.AddDependency(ctx.Module(), libTag, config.DefaultLibraries...) } if sdkDep.useModule { @@ -266,7 +266,7 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) { } } else { if j.deviceProperties.Dex { - ctx.AddDependency(ctx.Module(), bootClasspathTag, "core-oj", "core-libart") + ctx.AddDependency(ctx.Module(), bootClasspathTag, config.DefaultBootclasspathLibraries...) } } } |