--- a/make/lib/Lib-jdk.jpackager.gmk	Fri Nov 09 11:15:38 2018 -0500
+++ b/make/lib/Lib-jdk.jpackager.gmk	Fri Nov 16 14:42:43 2018 -0500
@@ -29,7 +29,8 @@
 
 LIBPACKAGER_SRC_ROOT := $(TOPDIR)/src/jdk.jpackager
 LIBPACKAGER_SHARED_SRC := $(LIBPACKAGER_SRC_ROOT)/share/native/library/common
-LIBPACKAGER_PLATFORM_SRC := $(LIBPACKAGER_SRC_ROOT)/$(OPENJDK_TARGET_OS)/native/library
+LIBPACKAGER_PLATFORM_SRC := \
+    $(LIBPACKAGER_SRC_ROOT)/$(OPENJDK_TARGET_OS)/native/library
 
 BUILD_LIBPACKAGER_SRC :=
 
@@ -40,7 +41,7 @@
 BUILD_LIBPACKAGER_SRC += $(LIBPACKAGER_SHARED_SRC)
 
 
-# Output shared library and debug symbols files in the same directory as .obj files.
+# Output shared library and symbols files in the same directory as .obj files.
 $(eval $(call SetupJdkLibrary, BUILD_LIBPACKAGER, \
     NAME := jpackager, \
     SRC := $(BUILD_LIBPACKAGER_SRC), \
@@ -48,7 +49,7 @@
     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CXXFLAGS_JDKLIB) -I$(LIBPACKAGER_SHARED_SRC), \
-    CFLAGS_windows :=  -nologo -EHsc -D_WINDOWS -DUNICODE -D_UNICODE -DWIN32 -D_LITTLE_ENDIAN -DWIN32_LEAN_AND_MEAN, \
+    CFLAGS_windows := -EHsc -DUNICODE -D_UNICODE, \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(LIBCXX), \
@@ -66,25 +67,22 @@
 
 ################################################################################
 
-PACKAGERAPPLAUNCHEREXE_SRC := $(TOPDIR)/src/jdk.jpackager/$(OPENJDK_TARGET_OS)/native/launcher
+PACKAGERAPPLAUNCHEREXE_SRC := \
+    $(TOPDIR)/src/jdk.jpackager/$(OPENJDK_TARGET_OS)/native/launcher
 
-
-# Output executable and debug symbols files in the same directory as .obj files.
+# Output executable and symbols files in the same directory as .obj files.
 $(eval $(call SetupJdkExecutable, BUILD_PACKAGERAPPLAUNCHEREXE, \
     NAME := papplauncher, \
     SRC := $(PACKAGERAPPLAUNCHEREXE_SRC), \
     OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/papplauncher, \
     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(CXXFLAGS_JDKEXE) -DFULL, \
-    CFLAGS_release := -DPRODUCT, \
+    CFLAGS := $(CXXFLAGS_JDKEXE), \
     CFLAGS_linux := -fPIC, \
     CFLAGS_solaris := -KPIC, \
     CFLAGS_macosx := -fPIC, \
-    CFLAGS_windows :=  -nologo -EHsc -D_WINDOWS -DUNICODE -D_UNICODE -DWIN32 -D_LITTLE_ENDIAN -DWIN32_LEAN_AND_MEAN, \
-    DISABLED_WARNINGS_gcc := unused-result implicit-fallthrough, \
-    LDFLAGS := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
-        $(call SET_SHARED_LIBRARY_ORIGIN), \
+    CFLAGS_windows := -EHsc -DUNICODE -D_UNICODE, \
+    LDFLAGS_windows := -nologo, \
     LDFLAGS_macosx := -stdlib=libstdc++, \
     LIBS_macosx := -framework Cocoa, \
     LIBS := $(LIBCXX), \
@@ -99,33 +97,31 @@
 # Build console version of launcher
 ifeq ($(OPENJDK_TARGET_OS), windows)
 
-PACKAGERAPPLAUNCHERCEXE_SRC := $(TOPDIR)/src/jdk.jpackager/$(OPENJDK_TARGET_OS)/native/launcher
+# Output executable and symbols files in the same directory as .obj files.
+  $(eval $(call SetupJdkExecutable, BUILD_PACKAGERAPPLAUNCHERCEXE, \
+      NAME := papplauncherc, \
+      SRC := $(PACKAGERAPPLAUNCHEREXE_SRC), \
+      OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/papplauncherc, \
+      TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
+      OPTIMIZATION := LOW, \
+      CFLAGS := $(CXXFLAGS_JDKEXE), \
+      CFLAGS_windows := -EHsc -DLAUNCHERC -DUNICODE -D_UNICODE, \
+      LDFLAGS_windows := -nologo, \
+      LIBS := $(LIBCXX), \
+      LIBS_windows :=  user32.lib shell32.lib advapi32.lib, \
+      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
+  ))
 
-# Output executable and debug symbols files in the same directory as .obj files.
-$(eval $(call SetupJdkExecutable, BUILD_PACKAGERAPPLAUNCHERCEXE, \
-    NAME := papplauncherc, \
-    SRC := $(PACKAGERAPPLAUNCHERCEXE_SRC), \
-    OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/papplauncherc, \
-    TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
-    OPTIMIZATION := LOW, \
-    CFLAGS := $(CXXFLAGS_JDKEXE) -DFULL, \
-    CFLAGS_release := -DPRODUCT, \
-    CFLAGS_windows :=  -nologo -EHsc -DLAUNCHERC -D_WINDOWS -DUNICODE -D_UNICODE -DWIN32 -D_LITTLE_ENDIAN -DWIN32_LEAN_AND_MEAN, \
-    LDFLAGS := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
-        $(call SET_SHARED_LIBRARY_ORIGIN), \
-    LIBS := $(LIBCXX), \
-    LIBS_windows :=  user32.lib shell32.lib advapi32.lib, \
-    VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
-))
-
-TARGETS += $(BUILD_PACKAGERAPPLAUNCHERCEXE)
+  TARGETS += $(BUILD_PACKAGERAPPLAUNCHERCEXE)
 endif
 
 ################################################################################
 
 
-# Copy debug symbols to module lib output directory so that JDK build system put them in jdk/bin directory.
-# Copy binaries to module classes output directory so that JDK build system put them in module resources.
+# Copy debug symbols to module lib output directory so that JDK build system
+# put them in jdk/bin directory.
+# Copy binaries to module classes output directory so that JDK build system
+# put them in module resources.
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   RESOURCE_SUBDIR := mac
@@ -150,5 +146,5 @@
 $(call SetupCopyTargetFiles,BUILD_PACKAGERAPPLAUNCHEREXE)
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
-$(call SetupCopyTargetFiles,BUILD_PACKAGERAPPLAUNCHERCEXE)
+  $(call SetupCopyTargetFiles,BUILD_PACKAGERAPPLAUNCHERCEXE)
 endif