Hi. Can you please take a look on this fix? I have refactored the two existing build files. I needed to do that before adding next one. Bug: https://bugs.openjdk.java.net/browse/CODETOOLS-7902091 Webrev: http://cr.openjdk.java.net/~shurailine/7902091/webrev.00/index.html Thank you. Shura.