make/common/Modules.gmk

@@ -1,7 +1,7 @@
 #
-# Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.  Oracle designates this

@@ -126,10 +126,11 @@
 endif
 
 JRE_TOOL_MODULES += \
     jdk.jdwp.agent \
     jdk.pack \
+    jdk.jpackage \
     jdk.scripting.nashorn.shell \
     #
 
 ################################################################################
 

@@ -166,10 +167,11 @@
     jdk.management.jfr \
     jdk.naming.dns \
     jdk.naming.rmi \
     jdk.net \
     jdk.pack \
+    jdk.jpackage \
     jdk.rmic \
     jdk.scripting.nashorn \
     jdk.sctp \
     jdk.security.auth \
     jdk.security.jgss \

@@ -225,10 +227,17 @@
 ifeq ($(ENABLE_AOT), false)
   MODULES_FILTER += jdk.aot
 endif
 
 ################################################################################
+# jpackage is only on windows, macosx, and linux
+
+ifeq ($(filter $(OPENJDK_TARGET_OS), windows macosx linux), )
+  MODULES_FILTER += jdk.jpackage
+endif
+
+################################################################################
 # Module list macros
 
 # Use append so that the custom extension may add to these variables
 
 GENERATED_SRC_DIRS += \