40 ################################################################################ |
40 ################################################################################ |
41 |
41 |
42 # Add more directories here when needed. |
42 # Add more directories here when needed. |
43 BUILD_JDK_JTREG_NATIVE_SRC := \ |
43 BUILD_JDK_JTREG_NATIVE_SRC := \ |
44 $(JDK_TOPDIR)/test/native_sanity \ |
44 $(JDK_TOPDIR)/test/native_sanity \ |
|
45 $(JDK_TOPDIR)/test/java/lang/String/nativeEncoding \ |
45 # |
46 # |
46 |
47 |
47 BUILD_JDK_JTREG_OUTPUT_DIR := $(BUILD_OUTPUT)/support/test/jdk/jtreg/native |
48 BUILD_JDK_JTREG_OUTPUT_DIR := $(BUILD_OUTPUT)/support/test/jdk/jtreg/native |
48 |
49 |
49 BUILD_JDK_JTREG_IMAGE_DIR := $(TEST_IMAGE_DIR)/jdk/jtreg |
50 BUILD_JDK_JTREG_IMAGE_DIR := $(TEST_IMAGE_DIR)/jdk/jtreg |
|
51 |
|
52 ifeq ($(OPENJDK_TARGET_OS), windows) |
|
53 WIN_LIB_JAVA := $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib |
|
54 BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := $(WIN_LIB_JAVA) |
|
55 else ifeq ($(OPENJDK_TARGET_OS), solaris) |
|
56 BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := -ljava -lc |
|
57 else |
|
58 BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := -ljava |
|
59 endif |
50 |
60 |
51 $(eval $(call SetupTestFilesCompilation, BUILD_JDK_JTREG_LIBRARIES, \ |
61 $(eval $(call SetupTestFilesCompilation, BUILD_JDK_JTREG_LIBRARIES, \ |
52 TYPE := LIBRARY, \ |
62 TYPE := LIBRARY, \ |
53 SOURCE_DIRS := $(BUILD_JDK_JTREG_NATIVE_SRC), \ |
63 SOURCE_DIRS := $(BUILD_JDK_JTREG_NATIVE_SRC), \ |
54 OUTPUT_DIR := $(BUILD_JDK_JTREG_OUTPUT_DIR), \ |
64 OUTPUT_DIR := $(BUILD_JDK_JTREG_OUTPUT_DIR), \ |