equal
deleted
inserted
replaced
216 JDK_LIB_FILES := $(NOT_JRE_LIB_FILES) |
216 JDK_LIB_FILES := $(NOT_JRE_LIB_FILES) |
217 ifeq ($(OPENJDK_TARGET_OS), linux) |
217 ifeq ($(OPENJDK_TARGET_OS), linux) |
218 JDK_LIB_FILES += jexec |
218 JDK_LIB_FILES += jexec |
219 endif |
219 endif |
220 |
220 |
|
221 ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris),) # If Linux or Solaris |
|
222 JDK_LIB_FILES += $(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX) \ |
|
223 $(LIBRARY_PREFIX)jawt$(SHARED_LIBRARY_SUFFIX) |
|
224 endif |
|
225 |
221 # Find all files to copy from $(JDK_OUTPUTDIR)/lib |
226 # Find all files to copy from $(JDK_OUTPUTDIR)/lib |
222 # Jar files are not expected to be here |
227 # Jar files are not expected to be here |
223 ALL_JDKOUT_LIB_LIST := $(call not-containing,_the.,$(filter-out %.jar,\ |
228 ALL_JDKOUT_LIB_LIST := $(call not-containing,_the.,$(filter-out %.jar,\ |
224 $(call CacheFind,$(JDK_OUTPUTDIR)/lib))) |
229 $(call CacheFind,$(JDK_OUTPUTDIR)/lib))) |
225 # Find all files to copy from $(IMAGES_OUTPUTDIR)/lib |
230 # Find all files to copy from $(IMAGES_OUTPUTDIR)/lib |