equal
deleted
inserted
replaced
142 sun/nio/fs/MacOSXFileSystemProvider.java \ |
142 sun/nio/fs/MacOSXFileSystemProvider.java \ |
143 sun/nio/fs/MacOSXFileSystem.java \ |
143 sun/nio/fs/MacOSXFileSystem.java \ |
144 sun/nio/fs/MacOSXNativeDispatcher.java \ |
144 sun/nio/fs/MacOSXNativeDispatcher.java \ |
145 sun/tools/attach/BsdAttachProvider.java \ |
145 sun/tools/attach/BsdAttachProvider.java \ |
146 sun/tools/attach/BsdVirtualMachine.java |
146 sun/tools/attach/BsdVirtualMachine.java |
|
147 endif |
|
148 |
|
149 ifneq ($(OPENJDK_TARGET_OS),aix) |
|
150 EXFILES+=sun/nio/ch/AixAsynchronousChannelProvider.java \ |
|
151 sun/nio/ch/AixPollPort.java \ |
|
152 sun/nio/fs/AixFileStore.java \ |
|
153 sun/nio/fs/AixFileSystem.java \ |
|
154 sun/nio/fs/AixFileSystemProvider.java \ |
|
155 sun/nio/fs/AixNativeDispatcher.java \ |
|
156 sun/tools/attach/AixAttachProvider.java \ |
|
157 sun/tools/attach/AixVirtualMachine.java |
147 endif |
158 endif |
148 |
159 |
149 # Exclude BreakIterator classes that are just used in compile process to generate |
160 # Exclude BreakIterator classes that are just used in compile process to generate |
150 # data files and shouldn't go in the product |
161 # data files and shouldn't go in the product |
151 EXFILES += sun/text/resources/BreakIteratorRules.java \ |
162 EXFILES += sun/text/resources/BreakIteratorRules.java \ |
215 endif |
226 endif |
216 |
227 |
217 # Exclude another implicitly not included file. |
228 # Exclude another implicitly not included file. |
218 EXFILES += sun/util/locale/AsciiUtil.java |
229 EXFILES += sun/util/locale/AsciiUtil.java |
219 |
230 |
220 ifeq (, $(filter $(OPENJDK_TARGET_OS), solaris macosx)) |
231 ifeq (, $(filter $(OPENJDK_TARGET_OS), solaris macosx aix)) |
221 # |
232 # |
222 # only solaris and macosx |
233 # only solaris, macosx and aix |
223 # |
234 # |
224 EXFILES += sun/nio/fs/PollingWatchService.java |
235 EXFILES += sun/nio/fs/PollingWatchService.java |
225 endif |
236 endif |
226 |
237 |
227 # TODO: Fix when converting NIO |
238 # TODO: Fix when converting NIO |
287 sun/security/internal \ |
298 sun/security/internal \ |
288 sun/security/mscapi \ |
299 sun/security/mscapi \ |
289 sun/security/pkcs11 \ |
300 sun/security/pkcs11 \ |
290 # |
301 # |
291 |
302 |
|
303 AIX_SRC_DIRS := |
|
304 ifeq ($(OPENJDK_TARGET_OS),aix) |
|
305 AIX_SRC_DIRS += $(JDK_TOPDIR)/src/aix/classes |
|
306 |
|
307 # these files are duplicated in AIX_SRC_DIRS |
|
308 EXFILES += $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpChannelImpl.java \ |
|
309 $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \ |
|
310 $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java |
|
311 endif |
|
312 |
292 # The exception handling of swing beaninfo |
313 # The exception handling of swing beaninfo |
293 # These resources violates the convention of having code and resources together under |
314 # These resources violates the convention of having code and resources together under |
294 # $(JDK_TOPDIR)/src/.../classes directories |
315 # $(JDK_TOPDIR)/src/.../classes directories |
295 $(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/%.gif: $(JDK_TOPDIR)/make/data/swingbeaninfo/images/%.gif |
316 $(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/%.gif: $(JDK_TOPDIR)/make/data/swingbeaninfo/images/%.gif |
296 $(call install-file) |
317 $(call install-file) |
311 $(eval $(call SetupJavaCompilation,BUILD_JDK,\ |
332 $(eval $(call SetupJavaCompilation,BUILD_JDK,\ |
312 SETUP:=GENERATE_JDKBYTECODE,\ |
333 SETUP:=GENERATE_JDKBYTECODE,\ |
313 SRC:=$(JDK_TOPDIR)/src/share/classes \ |
334 SRC:=$(JDK_TOPDIR)/src/share/classes \ |
314 $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes \ |
335 $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes \ |
315 $(MACOSX_SRC_DIRS) \ |
336 $(MACOSX_SRC_DIRS) \ |
|
337 $(AIX_SRC_DIRS) \ |
316 $(JDK_OUTPUTDIR)/gensrc \ |
338 $(JDK_OUTPUTDIR)/gensrc \ |
317 $(JDK_OUTPUTDIR)/gensrc_no_srczip \ |
339 $(JDK_OUTPUTDIR)/gensrc_no_srczip \ |
318 $(CLOSED_SRC_DIRS),\ |
340 $(CLOSED_SRC_DIRS),\ |
319 INCLUDES:=$(JDK_USER_DEFINED_FILTER),\ |
341 INCLUDES:=$(JDK_USER_DEFINED_FILTER),\ |
320 EXCLUDES:=$(EXCLUDES) $(SECURITY_PKGS),\ |
342 EXCLUDES:=$(EXCLUDES) $(SECURITY_PKGS),\ |