Integrated: 8347996: JavaCompilation.gmk should not include ZipArchive.gmk
Magnus Ihse Bursie
ihse at openjdk.org
Mon Jan 20 16:31:42 UTC 2025
On Fri, 17 Jan 2025 15:29:41 GMT, Magnus Ihse Bursie <ihse at openjdk.org> wrote:
> JavaCompilation.gmk includes ZipArchive.gmk, which includes ToolsJdk.gmk, which in turns includes JavaCompilation.gmk. This causes a circular dependency, which is not ideal. Make handles this anyway, but when I was developing new functionality to the build system, I discovered that this became a blocker.
>
> Fortunately, the solution is simple. We include ZipArchive.gmk to support the convenience argument SRCZIP. It is used only in a single place, when compiling demos, and we can just as well (and arguably even better) call SetupZipArchive directly there.
This pull request has now been integrated.
Changeset: 3a4d5ff7
Author: Magnus Ihse Bursie <ihse at openjdk.org>
URL: https://git.openjdk.org/jdk/commit/3a4d5ff7a326298e664e876f660c20170ca9f4a5
Stats: 28 lines in 2 files changed: 8 ins; 17 del; 3 mod
8347996: JavaCompilation.gmk should not include ZipArchive.gmk
Reviewed-by: erikj
-------------
PR: https://git.openjdk.org/jdk/pull/23175
More information about the build-dev
mailing list