diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-12-21 02:02:43 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-12-21 02:02:43 +0000 |
| commit | e65de78c9ad4109022266b51edfc5546afd0ef95 (patch) | |
| tree | 2c3328d46bd53b41578416383c6258c44c430a59 /java/java.go | |
| parent | 84d7453815df034e9417fb82af313ccdc08a7331 (diff) | |
| parent | 93567935fd147a7a0086fd94594ccf113953bfd8 (diff) | |
| download | build_soong-e65de78c9ad4109022266b51edfc5546afd0ef95.tar.gz build_soong-e65de78c9ad4109022266b51edfc5546afd0ef95.tar.bz2 build_soong-e65de78c9ad4109022266b51edfc5546afd0ef95.zip | |
Snap for 6091187 from 93567935fd147a7a0086fd94594ccf113953bfd8 to qt-qpr2-releaseandroid-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30
Change-Id: I57cb782c31c177ed6c08ba0b308b3f55c4eafc66
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/java/java.go b/java/java.go index 6bfdfeee..9ac38c92 100644 --- a/java/java.go +++ b/java/java.go @@ -1453,8 +1453,6 @@ func (j *Module) CompilerDeps() []string { type Library struct { Module - - InstallMixin func(ctx android.ModuleContext, installPath android.Path) (extraInstallDeps android.Paths) } func shouldUncompressDex(ctx android.ModuleContext, dexpreopter *dexpreopter) bool { @@ -1484,12 +1482,8 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { j.compile(ctx) if (Bool(j.properties.Installable) || ctx.Host()) && !android.DirectlyInAnyApex(ctx, ctx.ModuleName()) { - var extraInstallDeps android.Paths - if j.InstallMixin != nil { - extraInstallDeps = j.InstallMixin(ctx, j.outputFile) - } j.installFile = ctx.InstallFile(android.PathForModuleInstall(ctx, "framework"), - ctx.ModuleName()+".jar", j.outputFile, extraInstallDeps...) + ctx.ModuleName()+".jar", j.outputFile) } } |