On Fri, 17 Jan 2025 15:29:41 GMT, Magnus Ihse Bursie <i...@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. Looks good. Did you compare the demo src zips before and after? ------------- Marked as reviewed by erikj (Reviewer). PR Review: https://git.openjdk.org/jdk/pull/23175#pullrequestreview-2559680217