javac ast indices: Javac8RefScanner should be added to CP

This commit is contained in:
Dmitry Batkovich
2016-10-18 19:06:25 +03:00
parent 4d831a72d5
commit 64352f8317
@@ -312,14 +312,14 @@ public class ClasspathBootstrap {
}
private static List<String> getJavac8RefScannerClasspath() {
String jpsBuildersPath = getResourcePath(ClasspathBootstrap.class);
File jpsBuilders = new File(jpsBuildersPath);
if (jpsBuilders.isDirectory()) {
String instrumentationPath = getResourcePath(NotNullVerifyingInstrumenter.class);
File instrumentationUtil = new File(instrumentationPath);
if (instrumentationUtil.isDirectory()) {
//running from sources: load classes from .../out/production/javac-ref-scanner-8
return Collections.singletonList(new File(jpsBuilders.getParentFile(), "javac-ref-scanner-8").getAbsolutePath());
return Collections.singletonList(new File(instrumentationUtil.getParentFile(), "javac-ref-scanner-8").getAbsolutePath());
}
else {
return Collections.emptyList();
return Collections.singletonList(instrumentationPath);
}
}
}