diff options
| author | 2021-11-10 14:38:50 -0800 | |
|---|---|---|
| committer | 2021-11-10 14:38:50 -0800 | |
| commit | 3108ce17b0d56fb5ca2b73a013001ca32d6143ea (patch) | |
| tree | d30d58f3ac88499d57bf566f36925f8c3f0cd1af /java/java.go | |
| parent | 02ce1e783361d0f22c1737d051e603777cd2f519 (diff) | |
Add dependency from hostdex installed module to Make intermediates
The art tests rely on a dependency existing from
out/host/linux-x86/framework/core-oj-hostdex.jar to
out/host/common/obj/JAVA_LIBRARIES/core-oj-hostdex_intermediates/classes.jar,
override LOCAL_SOONG_INSTALLED_MODULE for the hostdex modules so that
soong_java_prebuilt.mk adds the dependency.
Test: art/tools/buildbot-build.sh --host && art/tools/run-libcore-tests.sh '--mode=host' '--variant=X64' --debug
Change-Id: I9412147fc66d5e5f0dae52d522868a37251f781e
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 |