From 965714f13942350b770a7985a473ccb6a414f406 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 3 Oct 2017 20:57:01 -0700 Subject: Fix bootclasspath for host variants of java_library modules The partial hostdex support was causing the host variant of java_library modules to depend on core-oj and core-libart, which caused the tagsoup jar to use the wrong java.lang.System.arraycopy signature. Remove the hostdex code that was causing the problem, and add a test. Test: java_test.go Change-Id: I4f7b1f29c99aae328ba19b042538d9d35544aa43 --- java/java.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index eb9480619..3eadbb658 100644 --- a/java/java.go +++ b/java/java.go @@ -285,9 +285,7 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) { ctx.AddDependency(ctx.Module(), bootClasspathTag, sdkDep.module) } } else { - if j.deviceProperties.Dex { - ctx.AddDependency(ctx.Module(), bootClasspathTag, config.DefaultBootclasspathLibraries...) - } + // TODO(ccross): add hostdex support } } ctx.AddDependency(ctx.Module(), libTag, j.properties.Libs...) -- cgit v1.2.3-59-g8ed1b