From f0f2e2cf79558569c227e8d96a784d9c0679814a Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 15 Oct 2019 16:36:40 -0700 Subject: Add tradefed_java_library_host Add a module type for tradefed libraries that causes an additional copy to be installed at out/host/linux-x86/tradefed. Bug: 122332235 Bug: 141877526 Test: m tradefed Change-Id: Ib7160dd060ad83d2dfb81d6a7106cb0dac98553e --- java/java.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 3b95f1e47..13fce085b 100644 --- a/java/java.go +++ b/java/java.go @@ -1571,6 +1571,8 @@ func (j *Module) hasCode(ctx android.ModuleContext) bool { type Library struct { Module + + InstallMixin func(ctx android.ModuleContext, installPath android.Path) (extraInstallDeps android.Paths) } func shouldUncompressDex(ctx android.ModuleContext, dexpreopter *dexpreopter) bool { @@ -1601,8 +1603,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...) } } -- cgit v1.2.3-59-g8ed1b