diff options
| author | Kimberly Kreider <kkreider@google.com> | 2019-12-18 21:51:36 +0000 |
|---|---|---|
| committer | Kimberly Kreider <kkreider@google.com> | 2019-12-19 23:57:58 +0000 |
| commit | 67e2fce5937430e2384a984fa98f77b79218fe96 (patch) | |
| tree | 141c67c0178f9a7755042bf2de1b97a3d6fda5d7 /java/java.go | |
| parent | 853f5c9edd4bf1e7888bc9504661a28ebeace861 (diff) | |
| download | android_build_soong-67e2fce5937430e2384a984fa98f77b79218fe96.tar.gz android_build_soong-67e2fce5937430e2384a984fa98f77b79218fe96.tar.bz2 android_build_soong-67e2fce5937430e2384a984fa98f77b79218fe96.zip | |
Revert submission 9919844-manual r1 merge
Reason for revert: broke tests b/146476630
Bug: 146476630
Reverted Changes:
Change-Id: I66b0f86dfc6336fa0dd88e6e4c340744a4791efd
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 480518e7..bf738c4d 100644 --- a/java/java.go +++ b/java/java.go @@ -1465,8 +1465,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 { @@ -1496,12 +1494,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) } } |