equal
deleted
inserted
replaced
29 GTEST_LAUNCHER_SRC := $(TOPDIR)/test/hotspot/gtest/gtestLauncher.cpp |
29 GTEST_LAUNCHER_SRC := $(TOPDIR)/test/hotspot/gtest/gtestLauncher.cpp |
30 GTEST_FRAMEWORK_SRC := $(TOPDIR)/test/fmw/gtest |
30 GTEST_FRAMEWORK_SRC := $(TOPDIR)/test/fmw/gtest |
31 |
31 |
32 # On Windows, there are no internal debug symbols so must set copying to true |
32 # On Windows, there are no internal debug symbols so must set copying to true |
33 # to get any at all. |
33 # to get any at all. |
34 ifeq ($(OPENJDK_TARGET_OS), windows) |
34 ifeq ($(call isTargetOs, windows), true) |
35 GTEST_COPY_DEBUG_SYMBOLS := true |
35 GTEST_COPY_DEBUG_SYMBOLS := true |
36 else |
36 else |
37 GTEST_COPY_DEBUG_SYMBOLS := false |
37 GTEST_COPY_DEBUG_SYMBOLS := false |
38 endif |
38 endif |
39 |
39 |
40 ################################################################################ |
40 ################################################################################ |
41 |
41 |
42 ifeq ($(OPENJDK_TARGET_OS), windows) |
42 ifeq ($(call isTargetOs, windows), true) |
43 GTEST_JVM_MAPFILE := $(JVM_MAPFILE) |
43 GTEST_JVM_MAPFILE := $(JVM_MAPFILE) |
44 else |
44 else |
45 GTEST_JVM_MAPFILE := $(JVM_OUTPUTDIR)/gtest/mapfile |
45 GTEST_JVM_MAPFILE := $(JVM_OUTPUTDIR)/gtest/mapfile |
46 |
46 |
47 $(JVM_OUTPUTDIR)/gtest/symbols: $(JVM_OUTPUTDIR)/symbols |
47 $(JVM_OUTPUTDIR)/gtest/symbols: $(JVM_OUTPUTDIR)/symbols |