--- a/make/launcher/Launcher-jdk.packager.gmk	Fri Nov 02 11:34:56 2018 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-#
-# Copyright (c) 2018, 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
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-include LauncherCommon.gmk
-
-
-################################################################################
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
-
-JPACKAGEREXE_SRC := $(TOPDIR)/src/jdk.packager/windows/native/jpackager
-
-$(eval $(call SetupJdkExecutable, BUILD_JPACKAGEREXE, \
-    NAME := jpackager, \
-    SRC := $(JPACKAGEREXE_SRC), \
-    TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
-    OPTIMIZATION := LOW, \
-    CFLAGS := $(CXXFLAGS_JDKEXE) -nologo -DFULL  -EHsc \
-	  -DWIN32 -D_LITTLE_ENDIAN -DWIN32_LEAN_AND_MEAN \
-	  -DUNICODE -D_UNICODE, \
-    CFLAGS_release := -DPRODUCT, \
-    DISABLED_WARNINGS_gcc := unused-result implicit-fallthrough, \
-    LDFLAGS := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) -nologo \
-        $(call SET_SHARED_LIBRARY_ORIGIN), \
-    LIBS := $(LIBCXX) user32.lib shell32.lib advapi32.lib ole32.lib, \
-    VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
-))
-
-TARGETS += $(BUILD_JPACKAGEREXE)
-
-else
-
-  # Chmod to avoid permission issues for exploded JDK
-define copy-and-chmod
-    $(install-file)
-    $(CHMOD) +x $@
-endef
-
-#copy script for Unix
-$(eval $(call SetupCopyFiles, COPY_JPACKAGERSCRIPT, \
-    SRC := $(TOPDIR)/src/jdk.packager/unix/scripts/, \
-    DEST := $(SUPPORT_OUTPUTDIR)/modules_cmds/$(MODULE), \
-    FILES := jpackager, \
-    MACRO := copy-and-chmod, \
-))
-
-TARGETS += $(COPY_JPACKAGERSCRIPT)
-
-endif
-
-################################################################################