make/CompileJavaModules.gmk

rev 2218 : Merge

*** 40,50 ****
  
  java.activation_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
  
  ################################################################################
  
! java.base_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*'
  java.base_COPY := .icu .dat .spp content-types.properties hijrah-config-islamic-umalqura.properties
  java.base_CLEAN := intrinsic.properties
  
  java.base_EXCLUDES += java/lang/doc-files
  
--- 40,50 ----
  
  java.activation_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
  
  ################################################################################
  
! java.base_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*' -XDstringConcat=inline
  java.base_COPY := .icu .dat .spp content-types.properties hijrah-config-islamic-umalqura.properties
  java.base_CLEAN := intrinsic.properties
  
  java.base_EXCLUDES += java/lang/doc-files
  
*** 351,361 ****
  
  jdk.charsets_COPY := .dat
  
  ################################################################################
  
! jdk.compiler_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:-com.sun.tools.*'
  jdk.compiler_COPY := javax.tools.JavaCompilerTool
  jdk.compiler_CLEAN_FILES := $(wildcard \
      $(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
          sun/tools/serialver/resources))
  
--- 351,361 ----
  
  jdk.charsets_COPY := .dat
  
  ################################################################################
  
! jdk.compiler_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:-com.sun.tools.*' -XDstringConcat=inline
  jdk.compiler_COPY := javax.tools.JavaCompilerTool
  jdk.compiler_CLEAN_FILES := $(wildcard \
      $(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
          sun/tools/serialver/resources))