diff options
| author | 2019-12-20 15:33:06 +0000 | |
|---|---|---|
| committer | 2019-12-20 15:38:36 +0000 | |
| commit | 8b81e98da48784047aeea06c2d5e5f417bce2c8c (patch) | |
| tree | 2c3328d46bd53b41578416383c6258c44c430a59 /java/java.go | |
| parent | 4ba82c94824137acae8ed1c69db6d1c151b155ee (diff) | |
Revert submission 9940985-qpr1-dev merge
Reason for revert: broke tests b/146476630
Bug: 146476630
Reverted Changes:
Change-Id: I48c73bcb0819f7cb4c41834cdd680e9e6c323be7
Exclude all builds containing Colin's original change
Meged-In: f0f2e2cf79558569c227e8d96a784d9c0679814a
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 6bfdfeee4..9ac38c92c 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) } } |