Merge
authorduke
Wed, 05 Jul 2017 18:22:41 +0200
changeset 13714 6a8ac3685211
parent 13713 61be07ec4655 (diff)
parent 13710 133e512eafa4 (current diff)
child 13718 1541817da403
Merge
jdk/make/common/Defs-embedded.gmk
jdk/make/common/Release-embedded.gmk
--- a/jaxp/.hgtags	Wed Jul 05 18:22:37 2017 +0200
+++ b/jaxp/.hgtags	Wed Jul 05 18:22:41 2017 +0200
@@ -177,3 +177,4 @@
 2c566f25c39f0087464b73e3bcf1c1421d0f2a7e jdk8-b53
 7dd81ccb7c1134df70969b3068b1e98def701746 jdk8-b54
 7c2363666890c6675194948fbcd74d81ddb84298 jdk8-b55
+f19d63b2119a0092f016203981ffef5cc31bc3c5 jdk8-b56
--- a/jaxp/makefiles/Makefile	Wed Jul 05 18:22:37 2017 +0200
+++ b/jaxp/makefiles/Makefile	Wed Jul 05 18:22:41 2017 +0200
@@ -40,11 +40,9 @@
 $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\
      JVM:=$(JAVA),\
      JAVAC:=$(JAVAC_JARS),\
-     FLAGS:=-Xprefer:source -XDignore.symbol.file=true $(DISABLE_JAXP_WARNINGS) -g,\
-     SERVER_DIR:=$(JAVAC_SERVERS),\
-     SERVER_JVM:=$(SERVER_JAVA),\
-     MODE:=$(JAVAC_USE_MODE),\
-     USE_DEPS:=$(JAVAC_USE_DEPS)))
+     FLAGS:=-XDignore.symbol.file=true $(DISABLE_JAXP_WARNINGS) -g,\
+     SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
+     SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
 
 $(eval $(call SetupJavaCompilation,BUILD_JAXP,\
 		SETUP:=GENERATE_NEWBYTECODE_DEBUG,\