*** old/make/CompileTools.gmk	Wed Feb 15 16:54:54 2017
--- new/make/CompileTools.gmk	Wed Feb 15 16:54:54 2017

*** 36,48 ****
--- 36,48 ----
  
  # Hook to include the corresponding custom file, if present.
  $(eval $(call IncludeCustomExtension, hotspot, CompileTools.gmk))
  
  ifeq ($(INCLUDE_GRAAL), true)
!   VM_CI_SRC_DIR := $(HOTSPOT_TOPDIR)/src/jdk.internal.vm.ci/share/classes
  
!   SRC_DIR := $(HOTSPOT_TOPDIR)/src/jdk.internal.vm.compiler/share/classes
  
    ##############################################################################
    # Compile the annotation processors
    $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_MATCH_PROCESSOR, \
        SETUP := GENERATE_OLDBYTECODE, \