Merge
authorduke
Wed, 05 Jul 2017 18:09:35 +0200
changeset 12486 a358c8ec4f77
parent 12485 19c92373018b (diff)
parent 12482 825347ec0509 (current diff)
child 12488 84ae0697b90d
Merge
--- a/jaxp/.hgtags	Wed Jul 05 18:09:33 2017 +0200
+++ b/jaxp/.hgtags	Wed Jul 05 18:09:35 2017 +0200
@@ -157,3 +157,4 @@
 9bcab2b8b8ea578e594916a3d3df6dbec7984bcb jdk8-b33
 8b91a897a04486cf901af0de7f684a3eb31f121f jdk8-b34
 e187f3ede64965dc2979df9a211107cd3d38eacb jdk8-b35
+cfd288fe1d3e2b700838342e70d71d44ac991af5 jdk8-b36
--- a/jaxp/makefiles/Makefile	Wed Jul 05 18:09:33 2017 +0200
+++ b/jaxp/makefiles/Makefile	Wed Jul 05 18:09:35 2017 +0200
@@ -47,7 +47,7 @@
 
 $(eval $(call SetupJavaCompilation,BUILD_JAXP,\
 		SETUP:=GENERATE_NEWBYTECODE_DEBUG,\
-		SRC:=$(JAXP_TOPDIR)/src/share/classes,\
+		SRC:=$(JAXP_TOPDIR)/src,\
 		CLEAN:=.properties,\
 		BIN:=$(JAXP_OUTPUTDIR)/classes,\
 		SRCZIP:=$(JAXP_OUTPUTDIR)/dist/lib/src.zip))