From cb2c92961c7217ac2bdd6bbd94849b087cb2fbc9 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Sat, 23 Sep 2017 19:57:16 -0700 Subject: Remove duplication of bootclasspath in DefaultLibraries Don't add bootclasspath libraries as classpath dependencies too. Test: m -j checkbuild Change-Id: Icb45e45536ce3babab73f67d281ca593edd4ab7f --- java/java.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/java.go') 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...) } } } -- cgit v1.2.3-59-g8ed1b