--- old/make/copy/Copy-java.base.gmk	2018-06-11 13:06:32.451003375 -0700
+++ new/make/copy/Copy-java.base.gmk	2018-06-11 13:06:32.227003383 -0700
@@ -86,11 +86,10 @@
 endif
 DEFAULT_CFG_VARIANT ?= server
 
-# Any variant other than server, client or minimal is represented as server in
-# the cfg file.
-VALID_CFG_VARIANTS := server client minimal
-CFG_VARIANTS := $(filter $(VALID_CFG_VARIANTS), $(JVM_VARIANTS)) \
-    $(if $(filter-out $(VALID_CFG_VARIANTS), $(JVM_VARIANTS)), server)
+# Any variant other than the valid multiple jvm variants is represented as
+# server in the cfg file.
+CFG_VARIANTS := $(filter $(VALID_MULTIPLE_JVM_VARIANTS), $(JVM_VARIANTS)) \
+    $(if $(filter-out $(VALID_MULTIPLE_JVM_VARIANTS), $(JVM_VARIANTS)), server)
 
 # Change the order to put the default variant first if present.
 ORDERED_CFG_VARIANTS := \