--- old/make/common/Release-embedded.gmk Fri Nov 11 11:24:42 2011 +++ new/make/common/Release-embedded.gmk Fri Nov 11 11:24:42 2011 @@ -189,7 +189,7 @@ $(RM) -r $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/audio $(RM) -fr $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/applet $(RM) $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/$(LIBARCH)/awt_robot - $(RM) -r $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/$(LIBARCH)/xawt + $(RM) $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/$(LIBARCH)/libawt_xawt.so $(RM) -r $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/$(LIBARCH)/libsplashscreen.so @# Remove oblique fonts and reduce font support to LucidaSansRegular only $(RM) -fr $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/oblique-fonts --- old/make/sun/font/Makefile Fri Nov 11 11:24:43 2011 +++ new/make/sun/font/Makefile Fri Nov 11 11:24:43 2011 @@ -175,7 +175,7 @@ ifeq ($(PLATFORM), solaris) # Note that on Solaris, fontmanager is built against the headless library. LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/headless - OTHER_LDLIBS += -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt -lc $(LIBM) $(LIBCXX) + OTHER_LDLIBS += -lawt -lawt_xawt -lc $(LIBM) $(LIBCXX) else # PLATFORM is linux OTHER_LDLIBS += -lawt $(LIBM) $(LIBCXX) ifeq ("$(CC_VER_MAJOR)", "3") --- old/make/sun/font/t2k/Makefile Fri Nov 11 11:24:44 2011 +++ new/make/sun/font/t2k/Makefile Fri Nov 11 11:24:44 2011 @@ -99,7 +99,7 @@ endif else ifeq ($(PLATFORM), solaris) - OTHER_LDLIBS += -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt + OTHER_LDLIBS += -lawt -lawt_xawt endif endif endif --- old/make/sun/headless/Makefile Fri Nov 11 11:24:45 2011 +++ new/make/sun/headless/Makefile Fri Nov 11 11:24:45 2011 @@ -28,11 +28,9 @@ NO_ROBOT = true MOTIF_VERSION = none MOTIF_VERSION_STRING=none -LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/headless PACKAGE = sun.awt -LIBRARY = mawt -LIBRARY_OUTPUT = headless +LIBRARY = awt_headless PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk --- old/make/sun/jawt/Makefile Fri Nov 11 11:24:46 2011 +++ new/make/sun/jawt/Makefile Fri Nov 11 11:24:45 2011 @@ -113,17 +113,17 @@ # ifeq ($(PLATFORM), solaris) ifndef BUILD_HEADLESS_ONLY - OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -L$(OPENWIN_LIB) -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt -L/usr/openwin/sfw/lib$(ISA_DIR) -lXrender + OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -L$(OPENWIN_LIB) -lawt_xawt -L/usr/openwin/sfw/lib$(ISA_DIR) -lXrender else - OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -L$(OPENWIN_LIB) -L$(LIBDIR)/$(LIBARCH)/headless -lmawt -L/usr/openwin/sfw/lib$(ISA_DIR) -lXrender + OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -L$(OPENWIN_LIB) -lawt_headless -L/usr/openwin/sfw/lib$(ISA_DIR) -lXrender endif endif # PLATFORM ifeq ($(PLATFORM), linux) ifndef BUILD_HEADLESS_ONLY - OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt + OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -lawt_xawt else - OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/headless -lmawt + OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -lawt_headless CFLAGS += -DHEADLESS endif endif # PLATFORM --- old/make/sun/xawt/Makefile Fri Nov 11 11:24:47 2011 +++ new/make/sun/xawt/Makefile Fri Nov 11 11:24:46 2011 @@ -25,9 +25,7 @@ BUILDDIR = ../.. PACKAGE = sun.awt.X11 -LIBRARY = mawt -LIBRARY_OUTPUT = xawt -LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/xawt +LIBRARY = awt_xawt PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk --- old/src/solaris/native/java/lang/java_props_md.c Fri Nov 11 11:24:47 2011 +++ new/src/solaris/native/java/lang/java_props_md.c Fri Nov 11 11:24:47 2011 @@ -310,7 +310,7 @@ } #ifdef JAVASE_EMBEDDED -/* Determine the default embedded toolkit based on whether lib/xawt/ +/* Determine the default embedded toolkit based on whether libawt_xawt * exists in the JRE. This can still be overridden by -Dawt.toolkit=XXX */ static char* getEmbeddedToolkit() { @@ -325,8 +325,8 @@ realpath((char *)dlinfo.dli_fname, buf); len = strlen(buf); p = strrchr(buf, '/'); - /* Default AWT Toolkit on Linux and Solaris is XAWT. */ - strncpy(p, "/xawt/", MAXPATHLEN-len-1); + /* Default AWT Toolkit on Linux and Solaris is XAWT (libawt_xawt.so). */ + strncpy(p, "/libawt_xawt.so", MAXPATHLEN-len-1); /* Check if it exists */ if (stat(buf, &statbuf) == -1 && errno == ENOENT) { /* No - this is a reduced-headless-jre so use special HToolkit */ --- old/src/solaris/native/sun/awt/awt_LoadLibrary.c Fri Nov 11 11:24:48 2011 +++ new/src/solaris/native/sun/awt/awt_LoadLibrary.c Fri Nov 11 11:24:48 2011 @@ -105,7 +105,7 @@ /* * The code below is responsible for: - * 1. Loading appropriate awt library, i.e. xawt/libmawt or headless/libwawt + * 1. Loading appropriate awt library, i.e. libawt_xawt or libawt_headless * 2. Setting "awt.toolkit" system property to use the appropriate Java toolkit class, * (if user has specified the toolkit in env varialble) */ @@ -130,10 +130,10 @@ /* Calculate library name to load */ if (AWTIsHeadless()) { - strncpy(p, "/headless/libmawt.so", MAXPATHLEN-len-1); + strncpy(p, "/libawt_headless.so", MAXPATHLEN-len-1); } else { /* Default AWT Toolkit on Linux and Solaris is XAWT. */ - strncpy(p, "/xawt/libmawt.so", MAXPATHLEN-len-1); + strncpy(p, "/libawt_xawt.so", MAXPATHLEN-len-1); } if (toolkit) { @@ -161,7 +161,7 @@ /* * This entry point must remain in libawt.so as part of a contract * with the CDE variant of Java Media Framework. (sdtjmplay) - * Reflect this call over to the correct libmawt.so. + * Reflect this call over to the correct libawt_.so. */ JNIEXPORT void JNICALL Java_sun_awt_motif_XsessionWMcommand(JNIEnv *env, jobject this, @@ -191,7 +191,7 @@ /* * This entry point must remain in libawt.so as part of a contract * with the CDE variant of Java Media Framework. (sdtjmplay) - * Reflect this call over to the correct libmawt.so. + * Reflect this call over to the correct libawt_.so. */ JNIEXPORT void JNICALL Java_sun_awt_motif_XsessionWMcommand_New(JNIEnv *env, jobjectArray jargv) @@ -250,7 +250,7 @@ /* * These entry point must remain in libawt.so ***for Java Plugin ONLY*** - * Reflect this call over to the correct libmawt.so. + * Reflect this call over to the correct libawt_.so. */ REFLECT_VOID_FUNCTION(getAwtLockFunctions,