# HG changeset patch
# User simonis
# Date 1409306431 -7200
# Node ID 3c7e92c78bab9e4d5c50b42c6fdc04d3539e9ac3
# Parent  d951b75dc190813fee79a119b9e342d48074bb49
8056246: Fix AIX build after the Modular Source Code change 8054834
Reviewed-by: erikj, ihse

diff -r d951b75dc190 -r 3c7e92c78bab jdk/make/lib/Awt2dLibraries.gmk
--- a/jdk/make/lib/Awt2dLibraries.gmk	Fri Aug 29 09:57:55 2014 +0800
+++ b/jdk/make/lib/Awt2dLibraries.gmk	Fri Aug 29 12:00:31 2014 +0200
@@ -149,13 +149,17 @@
     $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \
     #
 
+ifeq ($(OPENJDK_TARGET_OS), aix)
+  LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/libawt
+endif
+
 ifeq ($(OPENJDK_TARGET_OS), windows)
   LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/utility
 else
   LIBAWT_EXFILES := sun/java2d/ShaderList.c
 endif
 
-ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx), )
+ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix), )
   LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c
 endif
 
@@ -165,14 +169,11 @@
 
 LIBAWT_CFLAGS += -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
     $(addprefix -I, $(shell find $(LIBAWT_DIRS) -type d)) \
-    -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \
     $(LIBJAVA_HEADER_FLAGS) \
     $(addprefix -I, $(BUILD_LIBMLIB_IMAGE_SRC)) \
     #
 
-LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \
-    $(X_CFLAGS) \
-    $(foreach dir, $(LIBAWT_DIRS), -I$(dir))
+LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES $(X_CFLAGS)
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
 endif
diff -r d951b75dc190 -r 3c7e92c78bab jdk/make/lib/NetworkingLibraries.gmk
--- a/jdk/make/lib/NetworkingLibraries.gmk	Fri Aug 29 09:57:55 2014 +0800
+++ b/jdk/make/lib/NetworkingLibraries.gmk	Fri Aug 29 12:00:31 2014 +0200
@@ -44,7 +44,7 @@
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), aix)
-  LIBNET_SRC_DIRS += $(JDK_TOPDIR)/src/aix/native/java/net/
+  LIBNET_SRC_DIRS += $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libnet/java/net/
 endif
 
 $(eval $(call SetupNativeCompilation,BUILD_LIBNET, \
diff -r d951b75dc190 -r 3c7e92c78bab jdk/make/lib/NioLibraries.gmk
--- a/jdk/make/lib/NioLibraries.gmk	Fri Aug 29 09:57:55 2014 +0800
+++ b/jdk/make/lib/NioLibraries.gmk	Fri Aug 29 12:00:31 2014 +0200
@@ -56,17 +56,8 @@
 
 ifeq ($(OPENJDK_TARGET_OS), aix)
   BUILD_LIBNIO_MAPFILE:=$(JDK_TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
-  BUILD_LIBNIO_FILES += \
-      AixPollPort.c \
-      InheritedChannel.c \
-      AixNativeThread.c \
-      PollArrayWrapper.c \
-      UnixAsynchronousServerSocketChannelImpl.c \
-      UnixAsynchronousSocketChannelImpl.c \
-      GnomeFileTypeDetector.c \
-      UnixCopyFile.c \
-      AixNativeDispatcher.c \
-      UnixNativeDispatcher.c
+  BUILD_LIBNIO_EXFILES += \
+      NativeThread.c
 endif
 
 $(eval $(call SetupNativeCompilation,BUILD_LIBNIO, \