From 4ba82c94824137acae8ed1c69db6d1c151b155ee Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 18 Oct 2019 20:09:34 -0700 Subject: DO NOT MERGE: 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: 143908003 Exclude merging into *-plus-aosp branches, since they already include the change. Merged-In: I670345494abbad80dacab54471e635abfae3b3b3 Merged-In: I1cb25bbd5823a14f1a9428d58827677eff22ec7e Change-Id: I55bca53e02588827374896ef87d58f3f4bdc48c7 (cherry picked from commit f0f2e2cf79558569c227e8d96a784d9c0679814a) (cherry picked from commit cba45b28925b2fb3ebbd9e281a185de0d2b8b0c7) --- 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 9ac38c92..6bfdfeee 100644 --- a/java/java.go +++ b/java/java.go @@ -1453,6 +1453,8 @@ 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 { @@ -1482,8 +1484,12 @@ 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) + ctx.ModuleName()+".jar", j.outputFile, extraInstallDeps...) } } -- cgit v1.2.3