diff options
| author | 2017-10-03 20:57:01 -0700 | |
|---|---|---|
| committer | 2017-10-04 05:50:00 +0000 | |
| commit | 965714f13942350b770a7985a473ccb6a414f406 (patch) | |
| tree | 63fd8360e3897876a3d5ffc3e0a4d2c014b619bc /java/java.go | |
| parent | 19ab372dd8dd4bc7c1f2d5c8385b9a8e78137a88 (diff) | |
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
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 4 |
1 files changed, 1 insertions, 3 deletions
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...) |