RFR: 8056213 : Clean up unix/native/common/sun/awt

[Magnus Ihse Bursie]

On 2014-09-09 23:17, Phil Race wrote:
> After looking at the issues in the bug report below I think the only
> think that must be fixed is the unnecessary inclusion of initIDS.c in 
> libawt_xawt.so

You are correct indeed. I had missed the fact that awt_Font.c, 
fontpath.c and X11Color.c was included in libawt_headless. :-(

>
> https://bugs.openjdk.java.net/browse/JDK-8056213
> http://cr.openjdk.java.net/~prr/8056213/

Since initIDs.c are now only used in a single library, I think it is 
better to move it away from the "common" directory, into 
src/java.desktop/unix/native/libawt/sun/awt where it will get picked up 
automatically, but just for libawt. That means that instead of having to 
add even more excludes, you can delete some existing, like this:

diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk
--- a/make/lib/Awt2dLibraries.gmk
+++ b/make/lib/Awt2dLibraries.gmk
@@ -748,7 +748,6 @@
-I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libsunwjdga/ 
\
          $(LIBJAVA_HEADER_FLAGS) \
          #
-    LIBAWT_HEADLESS_EXFILES := initIDs.c

      LIBAWT_HEADLESS_REORDER :=
      ifeq ($(OPENJDK_TARGET_OS), solaris)
@@ -761,7 +760,6 @@
          LIBRARY := awt_headless, \
          OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
          SRC := $(LIBAWT_HEADLESS_DIRS), \
-        EXCLUDE_FILES := $(LIBAWT_HEADLESS_EXFILES), \
          EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \
          LANG := C, \
          OPTIMIZATION := LOW, \
@@ -932,7 +930,7 @@
        $(LIBJAVA_HEADER_FLAGS) \
        #

-  LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c initIDs.c
+  LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c
    LIBAWT_LWAWT_EXCLUDES := 
$(JDK_TOPDIR)/src/java.desktop/unix/native/common/sun/awt/medialib

    $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT, \


/Magnus