Fixed: javac.** not included in packaged JAR; 'null' returned from So…

…urceVersion.latest() and SourceVersion.getLatestSupported()
AndroidIDEOfficial · Aug 16, 2022 · 9e93319 · 9e93319
1 parent 502a0d6
commit 9e93319
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/make/langtools/netbeans/nb-javac/build.xml b/make/langtools/netbeans/nb-javac/build.xml
@@ -99,6 +99,7 @@
                 <include name="com/itsaky/**/*"/>
                 <include name="com/sun/**/*" />
                 <include name="java/lang/**/*" />
+                <include name="javac/internal/**/*"/>
                 <include name="javax/annotation/**/*" />
                 <include name="javax/lang/**/*" />
                 <include name="javax/tools/*" />
@@ -107,6 +108,7 @@
                 <include name="jdk/internal/jrtfs/**/*" />
                 <include name="jdk/internal/jmod/**/*" />
                 <include name="jdk/internal/jimage/**/*" />
+                <include name="sun/tools/**/*"/>
             </fileset>
         </jar>
         <delete file="${dist.jar}" />

diff --git a/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java b/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
@@ -261,7 +261,8 @@ public static SourceVersion latest() {
      * need to be updated accordingly.
      */
     private static SourceVersion getLatestSupported() {
-        return latest();
+        // AndroidIDE changed: Allow overriding latest supported source version.
+        return JavacConfigProvider.getLatestSupportedSourceVersion();
     }
 
 
@@ -288,7 +289,8 @@ private static SourceVersion getLatestSupported() {
      * which may be earlier than the {@code latest} release.
      */
     public static SourceVersion latestSupported() {
-        return latestSupported;
+        // AndroidIDE changed: Allow overriding latest supported source version.
+        return JavacConfigProvider.getLatestSupportedSourceVersion();
     }
 
     /**

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
@@ -2233,7 +2233,7 @@ VarSymbol readField() {
 
     /** Read a method.
      */
-    MethodSymbol readMethod() {
+    protected MethodSymbol readMethod() {
         long flags = adjustMethodFlags(nextChar());
         Name name = poolReader.getName(nextChar());
         Type type = poolReader.getType(nextChar());