On 5 Oct 2015, at 23:32, Mandy Chung <mandy.ch...@oracle.com> wrote:
> JDK 9 currently use a build tool (ImageBuilder) to create the JDK modular
> image. A in-house tool doing static analysis generates additional files that
> should be excluded in the image.
>
> jlink and jmod tool in jake build has the option to exclude specific files.
>
> This patch proposes to fix the interim ImageBuilder to exclude files with .bc
> suffix as a temporary workaround.
>
> Mandy
>
> diff --git a/make/src/classes/build/tools/module/ModuleArchive.java
> b/make/src/classes/build/tools/module/ModuleArchive.java
> --- a/make/src/classes/build/tools/module/ModuleArchive.java
> +++ b/make/src/classes/build/tools/module/ModuleArchive.java
> @@ -105,6 +105,7 @@
> entries.addAll(stream
> .filter(p -> !Files.isDirectory(p)
> &&
> !classes.relativize(p).toString().startsWith("_the.")
> + &&
> !classes.relativize(p).toString().endsWith(".bc")
> &&
> !classes.relativize(p).toString().equals("javac_state"))
> .sorted()
> .map(p -> toEntry(p, classes,
> EntryType.CLASS_OR_RESOURCE))
Thanks Mandy, this looks good to me.
-Chris.
