diff options
| author | Colin Cross <ccross@android.com> | 2019-10-18 20:09:34 -0700 |
|---|---|---|
| committer | Kimberly Kreider <kkreider@google.com> | 2019-12-13 23:01:30 +0000 |
| commit | 853f5c9edd4bf1e7888bc9504661a28ebeace861 (patch) | |
| tree | 780e8dafddd1679c6afe9d2ee3ac060fdf115dd9 /java/java.go | |
| parent | 874cbda3386826a908450941ecc53df59216e2d4 (diff) | |
| download | android_build_soong-853f5c9edd4bf1e7888bc9504661a28ebeace861.tar.gz android_build_soong-853f5c9edd4bf1e7888bc9504661a28ebeace861.tar.bz2 android_build_soong-853f5c9edd4bf1e7888bc9504661a28ebeace861.zip | |
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)
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 bf738c4d..480518e7 100644 --- a/java/java.go +++ b/java/java.go @@ -1465,6 +1465,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 { @@ -1494,8 +1496,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...) } } |