diff options
| author | 2019-10-18 20:09:34 -0700 | |
|---|---|---|
| committer | 2019-10-18 20:09:34 -0700 | |
| commit | ff88f6b7008cef19b25bc1e3fc1027233705a01e (patch) | |
| tree | ed8d0c7fd2bdb54a3e9cc3e1e53d86573aee36e0 /java/java.go | |
| parent | 86984b84b13e08a3a517e346fbecb0fbb3f47071 (diff) | |
| parent | 8141c8781a927bea6f04d04eec6c9904e4f83d50 (diff) | |
Merge "Add tradefed_java_library_host"
am: 8141c8781a
Change-Id: I55bca53e02588827374896ef87d58f3f4bdc48c7
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index 0aef69e46..be48256af 100644 --- a/java/java.go +++ b/java/java.go @@ -1577,6 +1577,8 @@ func (j *Module) DepIsInSameApex(ctx android.BaseModuleContext, dep android.Modu type Library struct { Module + + InstallMixin func(ctx android.ModuleContext, installPath android.Path) (extraInstallDeps android.Paths) } func shouldUncompressDex(ctx android.ModuleContext, dexpreopter *dexpreopter) bool { @@ -1607,8 +1609,12 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { exclusivelyForApex := android.InAnyApex(ctx.ModuleName()) && !j.IsForPlatform() if (Bool(j.properties.Installable) || ctx.Host()) && !exclusivelyForApex { + 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) + ctx.ModuleName()+".jar", j.outputFile, extraInstallDeps...) } } |