--- a/make/launcher/Launcher-jdk.jpackage.gmk Thu Oct 24 16:48:53 2019 -0400
+++ b/make/launcher/Launcher-jdk.jpackage.gmk Thu Oct 24 17:14:42 2019 -0400
@@ -25,54 +25,6 @@
include LauncherCommon.gmk
-
-################################################################################
-
$(eval $(call SetupBuildLauncher, jpackage, \
MAIN_CLASS := jdk.jpackage.main.Main, \
))
-
-################################################################################
-
-JPACKAGE_APPLAUNCHEREXE_SRC := \
- $(TOPDIR)/src/jdk.jpackage/$(OPENJDK_TARGET_OS)/native/jpackageapplauncher
-
-# Output app launcher executable in resources dir, and symbols in the object dir
-$(eval $(call SetupJdkExecutable, BUILD_JPACKAGE_APPLAUNCHEREXE, \
- NAME := jpackageapplauncher, \
- OUTPUT_DIR := $(JDK_OUTPUTDIR)/modules/$(MODULE)/jdk/jpackage/internal/resources, \
- SYMBOLS_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jpackageapplauncher, \
- SRC := $(JPACKAGE_APPLAUNCHEREXE_SRC), \
- TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CXXFLAGS_JDKEXE), \
- CFLAGS_windows := -EHsc -DLAUNCHERC -DUNICODE -D_UNICODE, \
- LDFLAGS := $(LDFLAGS_JDKEXE), \
- LIBS_macosx := -framework Cocoa, \
- LIBS := $(LIBCXX), \
- LIBS_linux := -ldl, \
- LIBS_windows := user32.lib shell32.lib advapi32.lib, \
-))
-
-TARGETS += $(BUILD_JPACKAGE_APPLAUNCHEREXE)
-
-# Build non-console version of launcher
-ifeq ($(call isTargetOs, windows), true)
-
- $(eval $(call SetupJdkExecutable, BUILD_JPACKAGE_APPLAUNCHERWEXE, \
- NAME := jpackageapplauncherw, \
- OUTPUT_DIR := $(JDK_OUTPUTDIR)/modules/$(MODULE)/jdk/jpackage/internal/resources, \
- SYMBOLS_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jpackageapplauncherw, \
- SRC := $(JPACKAGE_APPLAUNCHEREXE_SRC), \
- TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CXXFLAGS_JDKEXE), \
- CFLAGS_windows := -EHsc -DUNICODE -D_UNICODE, \
- LDFLAGS := $(LDFLAGS_JDKEXE), \
- LIBS := $(LIBCXX), \
- LIBS_windows := user32.lib shell32.lib advapi32.lib, \
- ))
-
- TARGETS += $(BUILD_JPACKAGE_APPLAUNCHERWEXE)
-endif
-