The CLDR data is, since Jigsaw, used in two different modules -- java.base and jdk.localedata. Unfortunately, the split between these two modules were not fully finished as part of the Jigsaw project. This patch aims to resolving most of this. The CLDRConverter build tool is now called from Gensrc-java.base and Gensrc-jdk.localedata, for their respective module. The calls have been updated to match modern build-infra standards. Also, the raw CLDR data was located mixed in with the Java source, in jdk.localedata. This patch also moves the data to make/data/cldr, to align with input data to all other build tools. Bug: https://bugs.openjdk.java.net/browse/JDK-8218186 WebRev: http://cr.openjdk.java.net/~ihse/JDK-8218186-cleanup-CLDR/webrev.01 /Magnus