diff options
| author | 2019-05-08 14:30:12 -0700 | |
|---|---|---|
| committer | 2019-05-08 14:30:12 -0700 | |
| commit | 6c6e6cd64d7754a988c2a4172010dce4e39cadd0 (patch) | |
| tree | 18159bad6c412837e99f8ab0b9884d8b62862e76 /java/device_host_converter.go | |
| parent | 082640d6ee836bd440b7bf7794d8cf520b1e089f (diff) | |
Don't hide *.kotlin_module in turbine dependencies
The jars containing the merged header classes from transitive
static dependencies were stripping all of META-INF/. Kotlin
puts metadata in META-INF that is used to map the package to
the static class that contains the package-level functions.
This also exposed that the metadata in META-INF is always
called "name.kotlin_module", so a library that contains
kotlin files with a dependency that also contains kotlin files
would shade the metadata file. Use a unique name instead.
Fixes: 131709692
Test: m checkbuild
Change-Id: I5cd276e563206e37c4c0d90fe9f346e9396f88c0
Diffstat (limited to 'java/device_host_converter.go')
| -rw-r--r-- | java/device_host_converter.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/device_host_converter.go b/java/device_host_converter.go index b92f4d73e..3804c376c 100644 --- a/java/device_host_converter.go +++ b/java/device_host_converter.go @@ -126,7 +126,7 @@ func (d *DeviceHostConverter) GenerateAndroidBuildActions(ctx android.ModuleCont if len(d.headerJars) > 1 { outputFile := android.PathForModuleOut(ctx, "turbine-combined", jarName) TransformJarsToJar(ctx, outputFile, "turbine combine", d.headerJars, - android.OptionalPath{}, false, nil, nil) + android.OptionalPath{}, false, nil, []string{"META-INF/TRANSITIVE"}) d.combinedHeaderJar = outputFile } else { d.combinedHeaderJar = d.headerJars[0] |