# HG changeset patch
# User erikj
# Date 1418111861 -3600
# Node ID dd8be94d105fef25aac4f6d41849a8bada2354c0
# Parent  c6d5edd39016e49c055f64b321973d9b8c5d6684
8066761: Investigate -sourcepath usage when compiling java
Summary: Removed all uses of -sourcepath
Reviewed-by: jfranck, alanb, ihse

diff -r c6d5edd39016 -r dd8be94d105f jdk/make/CompileInterimRmic.gmk
--- a/jdk/make/CompileInterimRmic.gmk	Tue Dec 09 08:43:06 2014 +0100
+++ b/jdk/make/CompileInterimRmic.gmk	Tue Dec 09 08:57:41 2014 +0100
@@ -46,8 +46,7 @@
     SRC := $(JDK_TOPDIR)/src/jdk.rmic/share/classes, \
     INCLUDES := $(RMIC_PKGS), \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/interim_rmic_classes, \
-    COPY := .properties, \
-    JAVAC_SOURCE_PATH_OVERRIDE := $(addprefix $(JDK_TOPDIR)/src/jdk.rmic/share/classes/, $(RMIC_PKGS))))
+    COPY := .properties))
 
 ##########################################################################################
 
diff -r c6d5edd39016 -r dd8be94d105f jdk/make/gendata/GendataBreakIterator.gmk
--- a/jdk/make/gendata/GendataBreakIterator.gmk	Tue Dec 09 08:43:06 2014 +0100
+++ b/jdk/make/gendata/GendataBreakIterator.gmk	Tue Dec 09 08:57:41 2014 +0100
@@ -44,17 +44,10 @@
 # Generate BreakIteratorData
 BREAK_ITERATOR_CLASSES := $(BUILDTOOLS_OUTPUTDIR)/break_iterator_classes
 
-# JAVAC_SOURCE_PATH_OVERRIDE is set to isolate the compile to just those
-# two files in that directory and not get anything implicit from
-# surrounding directories which aren't jdk N-1 compatible.
-# Because we are targeting jdk N-1, but the surrounding source code is jdk N.
-# These two files should be moved out to a build tool! We have to disable
-# sjavac here as well.
+# These two files should be moved out to a build tool!
 $(eval $(call SetupJavaCompilation,BUILD_BREAKITERATOR, \
     SETUP := GENERATE_OLDBYTECODE, \
     SRC := $(TEXT_SRCDIR), \
-    DISABLE_SJAVAC := true, \
-    JAVAC_SOURCE_PATH_OVERRIDE := $(patsubst %, %/$(TEXT_PKG), $(TEXT_SRCDIR)), \
     INCLUDES := $(TEXT_PKG), \
     INCLUDE_FILES := $(TEXT_SOURCES), \
     BIN := $(BREAK_ITERATOR_CLASSES)))