make/lib/Lib-jdk.jpackage.gmk

*** 25,37 ****
--- 25,53 ----
  
  include LibCommon.gmk
  
  ################################################################################
  
+ APPLAUNCHER_POSIX_SRC := \
+ 
+ ifeq ($(OPENJDK_TARGET_OS), linux)
+ 
+     APPLAUNCHER_POSIX_SRC += $(TOPDIR)/src/$(MODULE)/posix/native/libapplauncher \
+ 
+ endif
+ 
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+ 
+     APPLAUNCHER_POSIX_SRC += $(TOPDIR)/src/$(MODULE)/posix/native/libapplauncher \
+ 
+ endif
+ 
  # Output app launcher library in resources dir, and symbols in the object dir
  $(eval $(call SetupJdkLibrary, BUILD_LIB_APPLAUNCHER, \
      NAME := applauncher, \
+     EXTRA_SRC := $(APPLAUNCHER_POSIX_SRC), \
+     EXTRA_HEADER_DIRS := $(APPLAUNCHER_POSIX_SRC), \
      OUTPUT_DIR := $(JDK_OUTPUTDIR)/modules/$(MODULE)/jdk/jpackage/internal/resources, \
      SYMBOLS_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libapplauncher, \
      TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
      OPTIMIZATION := LOW, \
      CFLAGS := $(CXXFLAGS_JDKLIB), \