From f4ba168d773fd6933c09c0b2175aa14847aaed53 Mon Sep 17 00:00:00 2001 From: Phil Race Date: Thu, 11 Sep 2014 13:07:37 -0700 Subject: [PATCH] 8056213: Clean up unix/native/common/sun/awt Reviewed-by: erikj, ihse --- jdk/make/lib/Awt2dLibraries.gmk | 4 +--- .../unix/native/{common => libawt}/sun/awt/initIDs.c | 0 2 files changed, 1 insertion(+), 3 deletions(-) rename jdk/src/java.desktop/unix/native/{common => libawt}/sun/awt/initIDs.c (100%) diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk index fa74e6e3694..46d7f2a73d1 100644 --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk @@ -746,7 +746,6 @@ ifeq ($(BUILD_HEADLESS), true) -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) @@ -759,7 +758,6 @@ ifeq ($(BUILD_HEADLESS), true) 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, \ @@ -930,7 +928,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) $(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, \ diff --git a/jdk/src/java.desktop/unix/native/common/sun/awt/initIDs.c b/jdk/src/java.desktop/unix/native/libawt/sun/awt/initIDs.c similarity index 100% rename from jdk/src/java.desktop/unix/native/common/sun/awt/initIDs.c rename to jdk/src/java.desktop/unix/native/libawt/sun/awt/initIDs.c