47 $(TOPDIR)/test/jdk/java/lang/ClassLoader/nativeLibrary \ |
47 $(TOPDIR)/test/jdk/java/lang/ClassLoader/nativeLibrary \ |
48 $(TOPDIR)/test/jdk/java/lang/String/nativeEncoding \ |
48 $(TOPDIR)/test/jdk/java/lang/String/nativeEncoding \ |
49 # |
49 # |
50 |
50 |
51 ifneq ($(OPENJDK_TARGET_OS), windows) |
51 ifneq ($(OPENJDK_TARGET_OS), windows) |
52 BUILD_JDK_JTREG_NATIVE_SRC += $(TOPDIR)/test/jdk/java/nio/channels/FileChannel/directio |
52 BUILD_JDK_JTREG_NATIVE_SRC += $(TOPDIR)/test/jdk/java/nio/channels/FileChannel/directio |
53 BUILD_JDK_JTREG_NATIVE_SRC += $(TOPDIR)/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel |
53 BUILD_JDK_JTREG_NATIVE_SRC += $(TOPDIR)/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel |
54 endif |
54 endif |
55 |
55 |
56 BUILD_JDK_JTREG_OUTPUT_DIR := $(OUTPUTDIR)/support/test/jdk/jtreg/native |
56 BUILD_JDK_JTREG_OUTPUT_DIR := $(OUTPUTDIR)/support/test/jdk/jtreg/native |
57 |
57 |
58 BUILD_JDK_JTREG_IMAGE_DIR := $(TEST_IMAGE_DIR)/jdk/jtreg |
58 BUILD_JDK_JTREG_IMAGE_DIR := $(TEST_IMAGE_DIR)/jdk/jtreg |
59 |
59 |
60 ifeq ($(OPENJDK_TARGET_OS), windows) |
60 ifeq ($(OPENJDK_TARGET_OS), windows) |
61 WIN_LIB_JAVA := $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib |
61 WIN_LIB_JAVA := $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib |
62 BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := $(WIN_LIB_JAVA) |
62 BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := $(WIN_LIB_JAVA) |
63 else ifeq ($(OPENJDK_TARGET_OS), linux) |
63 else |
64 BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := -ljava |
64 BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := -ljava |
65 BUILD_JDK_JTREG_LIBRARIES_LIBS_libDirectIO := -ljava |
65 BUILD_JDK_JTREG_LIBRARIES_LIBS_libDirectIO := -ljava |
|
66 ifeq ($(OPENJDK_TARGET_OS), linux) |
66 BUILD_JDK_JTREG_LIBRARIES_LIBS_libInheritedChannel := -ljava |
67 BUILD_JDK_JTREG_LIBRARIES_LIBS_libInheritedChannel := -ljava |
67 else ifeq ($(OPENJDK_TARGET_OS), solaris) |
68 else ifeq ($(OPENJDK_TARGET_OS), solaris) |
68 BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := -ljava -lc |
69 BUILD_JDK_JTREG_LIBRARIES_LIBS_libInheritedChannel := -ljava |
69 BUILD_JDK_JTREG_LIBRARIES_LIBS_libDirectIO := -ljava -lc |
70 endif |
70 BUILD_JDK_JTREG_LIBRARIES_LIBS_libInheritedChannel := -ljava -lc |
|
71 else |
|
72 BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := -ljava |
|
73 BUILD_JDK_JTREG_LIBRARIES_LIBS_libDirectIO := -ljava |
|
74 endif |
71 endif |
75 |
72 |
76 $(eval $(call SetupTestFilesCompilation, BUILD_JDK_JTREG_LIBRARIES, \ |
73 $(eval $(call SetupTestFilesCompilation, BUILD_JDK_JTREG_LIBRARIES, \ |
77 TYPE := LIBRARY, \ |
74 TYPE := LIBRARY, \ |
78 SOURCE_DIRS := $(BUILD_JDK_JTREG_NATIVE_SRC), \ |
75 SOURCE_DIRS := $(BUILD_JDK_JTREG_NATIVE_SRC), \ |