# HG changeset patch
# User herrick
# Date 1559924869 14400
# Node ID 747416ba316dca729fc681675561a39884e53668
# Parent  99e0948cbd98c1308a671e02515ca99e4a7a3c2b
8223080: Build team code review requests.
Reviewed-by: erikj

diff -r 99e0948cbd98 -r 747416ba316d make/CompileJavaModules.gmk
--- a/make/CompileJavaModules.gmk	Fri Jun 07 08:39:04 2019 -0400
+++ b/make/CompileJavaModules.gmk	Fri Jun 07 12:27:49 2019 -0400
@@ -380,8 +380,6 @@
 
 ################################################################################
 
-jdk.jpackage_ADD_JAVAC_FLAGS += -parameters -XDstringConcat=inline
-
 jdk.jpackage_COPY += .gif .png .txt .spec .script .prerm .preinst .postrm .postinst .list \
     .desktop .copyright .control .plist .template .icns .scpt .entitlements .wxs .iss .ico .bmp
 
diff -r 99e0948cbd98 -r 747416ba316d make/common/Modules.gmk
--- a/make/common/Modules.gmk	Fri Jun 07 08:39:04 2019 -0400
+++ b/make/common/Modules.gmk	Fri Jun 07 12:27:49 2019 -0400
@@ -231,7 +231,7 @@
 ################################################################################
 # jpackage is only on windows, macosx, and linux
 
-ifeq ($(filter $(OPENJDK_TARGET_OS), windows macosx linux), )
+ifeq ($(call isTargetOs, windows macosx linux), false)
   MODULES_FILTER += jdk.jpackage
 endif
 
diff -r 99e0948cbd98 -r 747416ba316d make/launcher/Launcher-jdk.jpackage.gmk
--- a/make/launcher/Launcher-jdk.jpackage.gmk	Fri Jun 07 08:39:04 2019 -0400
+++ b/make/launcher/Launcher-jdk.jpackage.gmk	Fri Jun 07 12:27:49 2019 -0400
@@ -57,7 +57,7 @@
 TARGETS += $(BUILD_JPACKAGE_APPLAUNCHEREXE)
 
 # Build non-console version of launcher
-ifeq ($(OPENJDK_TARGET_OS), windows)
+ifeq ($(call isTargetOs, windows), true)
 
   $(eval $(call SetupJdkExecutable, BUILD_JPACKAGE_APPLAUNCHERWEXE, \
       NAME := jpackageapplauncherw, \
diff -r 99e0948cbd98 -r 747416ba316d make/lib/Lib-jdk.jpackage.gmk
--- a/make/lib/Lib-jdk.jpackage.gmk	Fri Jun 07 08:39:04 2019 -0400
+++ b/make/lib/Lib-jdk.jpackage.gmk	Fri Jun 07 12:27:49 2019 -0400
@@ -50,7 +50,7 @@
 
 ################################################################################
 
-ifeq ($(OPENJDK_TARGET_OS), windows)
+ifeq ($(call isTargetOs, windows), true)
 
   $(eval $(call SetupJdkLibrary, BUILD_LIB_JPACKAGE, \
       NAME := jpackage, \
@@ -69,7 +69,7 @@
 
 # Build Wix custom action helper
 # Output library in resources dir, and symbols in the object dir
-ifeq ($(OPENJDK_TARGET_OS), windows)
+ifeq ($(call isTargetOs, windows), true)
 
   $(eval $(call SetupJdkLibrary, BUILD_LIB_WIXHELPER, \
       NAME := wixhelper, \