diff options
| author | 2017-09-23 19:57:16 -0700 | |
|---|---|---|
| committer | 2017-09-23 22:36:16 -0700 | |
| commit | cb2c92961c7217ac2bdd6bbd94849b087cb2fbc9 (patch) | |
| tree | 8425b337c4cc5182c44d23d514ef2e936e6207e5 /java/java.go | |
| parent | 968df27a9cc09828c38efacec7e86bdf31f06faf (diff) | |
Remove duplication of bootclasspath in DefaultLibraries
Don't add bootclasspath libraries as classpath dependencies too.
Test: m -j checkbuild
Change-Id: Icb45e45536ce3babab73f67d281ca593edd4ab7f
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...) } } } |