Looks good to me.
/Erik
On 2017-10-18 10:53, Magnus Ihse Bursie wrote:
The file jni.h is stored twice in the repo, both in hotspot and in
java.base. They are both identical, and only the java.base version is
included in the final product.
This bug is a part of the umbrella effort JDK-8167078 "Duplicate
header files in hotspot and jdk". As for JDK-8189607, my reasoning is
that the java.base version is the one to keep. (In this case, there
was actually a small difference between the two files -- the hotspot
version first copyright year was 1997, but the java.base version was
1996. It makes sense to keep the oldest one.)
My assumption was that hotspot include files should be sorted
according to the containing directory, and since jni.h no longer
resides in "prims", I've rearranged the include line where needed.
The -I path added in CompileJvm.gmk is identical to the one in
JDK-8189607, and will be merged to the same change (depending on which
fix enters first.)
Bug: https://bugs.openjdk.java.net/browse/JDK-8189608
WebRev:
http://cr.openjdk.java.net/~ihse/JDK-8189608-remove-duplicated-jni/webrev.01
/Magnus