--- a/make/hotspot/lib/CompileGtest.gmk	Tue Sep 12 19:03:39 2017 +0200
+++ b/make/hotspot/lib/CompileGtest.gmk	Tue Sep 12 19:03:56 2017 +0200
@@ -23,11 +23,11 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, hotspot, lib/CompileGtest.gmk))
+$(eval $(call IncludeCustomExtension, , hotspot/lib/CompileGtest.gmk))
 
-GTEST_TEST_SRC += $(HOTSPOT_TOPDIR)/test/native
-GTEST_LAUNCHER_SRC := $(HOTSPOT_TOPDIR)/test/native/gtestLauncher.cpp
-GTEST_FRAMEWORK_SRC := $(SRC_ROOT)/test/fmw/gtest
+GTEST_TEST_SRC += $(TOPDIR)/test/hotspot/gtest
+GTEST_LAUNCHER_SRC := $(TOPDIR)/test/hotspot/gtest/gtestLauncher.cpp
+GTEST_FRAMEWORK_SRC := $(TOPDIR)/test/fmw/gtest
 
 # On Windows, there are no internal debug symbols so must set copying to true
 # to get any at all.