diff options
| author | 2021-11-11 06:10:26 +0000 | |
|---|---|---|
| committer | 2021-11-11 06:10:26 +0000 | |
| commit | 45da465ef6eece7e794125d1d4d5223609086b06 (patch) | |
| tree | aecafe2e24b84e6ed7f0972039cc8ad0f8be2a6f /java/java.go | |
| parent | 008d17612aee44da24c8b52b223ca981445e3fdd (diff) | |
| parent | fa9bfcd0d27a2439a30f00849abec28ca490bf1d (diff) | |
Merge changes I9e38ac73,I9412147f
* changes:
Honor PreventInstall for APKs and dexpreopt files
Add dependency from hostdex installed module to Make intermediates
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index 3bb9a925b..2f9e03a80 100644 --- a/java/java.go +++ b/java/java.go @@ -571,7 +571,8 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { } hostDexNeeded := Bool(j.deviceProperties.Hostdex) && !ctx.Host() if hostDexNeeded { - ctx.InstallFile(android.PathForHostDexInstall(ctx, "framework"), + j.hostdexInstallFile = ctx.InstallFile( + android.PathForHostDexInstall(ctx, "framework"), j.Stem()+"-hostdex.jar", j.outputFile) } var installDir android.InstallPath |