make/gendata/Gendata-jdk.compiler.gmk

*** 1,7 ****
  #
! # Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 52,64 ****
      --add-exports jdk.compiler.interim/com.sun.tools.javac.jvm=ALL-UNNAMED \
      #
  
  $(eval $(call SetupJavaCompilation, COMPILE_CREATE_SYMBOLS, \
      SETUP := GENERATE_OLDBYTECODE, \
!     SRC := $(TOPDIR)/make/langtools/src/classes \
          $(TOPDIR)/src/jdk.jdeps/share/classes, \
!     INCLUDES := build/tools/symbolgenerator com/sun/tools/classfile, \
      BIN := $(BUILDTOOLS_OUTPUTDIR)/create_symbols, \
      ADD_JAVAC_FLAGS := $(INTERIM_LANGTOOLS_ARGS) \
          --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \
          $(COMPILECREATESYMBOLS_ADD_EXPORTS), \
  ))
--- 52,64 ----
      --add-exports jdk.compiler.interim/com.sun.tools.javac.jvm=ALL-UNNAMED \
      #
  
  $(eval $(call SetupJavaCompilation, COMPILE_CREATE_SYMBOLS, \
      SETUP := GENERATE_OLDBYTECODE, \
!     SRC := $(TOPDIR)/src/jdk.compiler/share/tools \
          $(TOPDIR)/src/jdk.jdeps/share/classes, \
!     INCLUDES := org/openjdk/buildtools/symbolgenerator com/sun/tools/classfile, \
      BIN := $(BUILDTOOLS_OUTPUTDIR)/create_symbols, \
      ADD_JAVAC_FLAGS := $(INTERIM_LANGTOOLS_ARGS) \
          --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \
          $(COMPILECREATESYMBOLS_ADD_EXPORTS), \
  ))
*** 71,88 ****
          $(MKDIR) -p $(@D)
          $(ECHO) Creating ct.sym classes
          $(JAVA_SMALL) $(INTERIM_LANGTOOLS_ARGS) \
              $(COMPILECREATESYMBOLS_ADD_EXPORTS) \
              -classpath $(BUILDTOOLS_OUTPUTDIR)/create_symbols \
!             build.tools.symbolgenerator.CreateSymbols \
              build-ctsym \
              $(CT_DATA_DESCRIPTION) \
              $(@D)
          $(JAVA_SMALL) $(INTERIM_LANGTOOLS_ARGS) \
              $(COMPILECREATESYMBOLS_ADD_EXPORTS) \
              -classpath $(BUILDTOOLS_OUTPUTDIR)/create_symbols \
!             build.tools.symbolgenerator.TransitiveDependencies \
              $(@D) \
              $(CT_MODULESOURCEPATH) \
              $(CT_MODULES)
          $(TOUCH) $@
  
--- 71,88 ----
          $(MKDIR) -p $(@D)
          $(ECHO) Creating ct.sym classes
          $(JAVA_SMALL) $(INTERIM_LANGTOOLS_ARGS) \
              $(COMPILECREATESYMBOLS_ADD_EXPORTS) \
              -classpath $(BUILDTOOLS_OUTPUTDIR)/create_symbols \
!             org.openjdk.buildtools.symbolgenerator.CreateSymbols \
              build-ctsym \
              $(CT_DATA_DESCRIPTION) \
              $(@D)
          $(JAVA_SMALL) $(INTERIM_LANGTOOLS_ARGS) \
              $(COMPILECREATESYMBOLS_ADD_EXPORTS) \
              -classpath $(BUILDTOOLS_OUTPUTDIR)/create_symbols \
!             org.openjdk.buildtools.symbolgenerator.TransitiveDependencies \
              $(@D) \
              $(CT_MODULESOURCEPATH) \
              $(CT_MODULES)
          $(TOUCH) $@