make/common/Modules.gmk

@@ -77,15 +77,18 @@
     java.corba \
     java.transaction \
     java.xml.bind \
     java.xml.ws \
     java.xml.ws.annotation \
+    jdk.internal.vm.compiler \
     #
 
 # Modules explicitly declared as not being upgradeable even though they require
 # an upgradeable module.
-NON_UPGRADEABLE_MODULES +=
+NON_UPGRADEABLE_MODULES += \
+    jdk.aot \
+    #
 
 AGGREGATOR_MODULES += \
     java.se \
     java.se.ee \
     #

@@ -107,11 +110,10 @@
     jdk.charsets \
     jdk.crypto.cryptoki \
     jdk.crypto.ec \
     jdk.dynalink \
     jdk.incubator.httpclient \
-    jdk.internal.vm.compiler \
     jdk.jsobject \
     jdk.localedata \
     jdk.naming.dns \
     jdk.scripting.nashorn \
     jdk.security.auth \