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 f0f2e2cf79
)
This commit is contained in:
@@ -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...)
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user